diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-28 12:05:23 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-08-28 12:05:23 +0100 |
| commit | 03b57e008b61dfcb1fbad3aea950ae0e001748b0 (patch) | |
| tree | 9a740c1a5fbe659ec83484b67cbc679332f5a408 /chrome/browser/sync/sync_ui_util.cc | |
| parent | ca7d0c81aa30d24514c34c963f43cd24da34a2bf (diff) | |
| download | chromium_org-03b57e008b61dfcb1fbad3aea950ae0e001748b0.tar.gz | |
Merge from Chromium at DEPS revision 291560
This commit was generated by merge_to_master.py.
Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
Diffstat (limited to 'chrome/browser/sync/sync_ui_util.cc')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 8143ca3110..e220262765 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -22,13 +22,13 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/browser/signin_manager_base.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/browser_resources.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" |