diff options
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/profile_sync_service_android.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/sync_error_notifier_ash.cc | 4 | ||||
-rw-r--r-- | chrome/browser/sync/sync_global_error.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 4 | ||||
-rw-r--r-- | chrome/browser/sync/sync_ui_util_unittest.cc | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 8c338cd..62b8b76 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -64,6 +64,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/gcm_driver/gcm_driver.h" #include "components/invalidation/invalidation_service.h" #include "components/invalidation/profile_invalidation_provider.h" @@ -82,7 +83,6 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" -#include "grit/generated_resources.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context_getter.h" #include "sync/api/sync_error.h" diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index 3f5b517..2432f54 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -22,6 +22,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/grit/generated_resources.h" #include "components/invalidation/object_id_invalidation_map.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/pref_names.h" @@ -32,7 +33,6 @@ #include "google/cacheinvalidation/types.pb.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/generated_resources.h" #include "jni/ProfileSyncService_jni.h" #include "sync/internal_api/public/network_resources.h" #include "sync/internal_api/public/read_transaction.h" diff --git a/chrome/browser/sync/sync_error_notifier_ash.cc b/chrome/browser/sync/sync_error_notifier_ash.cc index f203dce..6f33066 100644 --- a/chrome/browser/sync/sync_error_notifier_ash.cc +++ b/chrome/browser/sync/sync_error_notifier_ash.cc @@ -18,8 +18,8 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc index d3f72b2a..227990b 100644 --- a/chrome/browser/sync/sync_global_error.cc +++ b/chrome/browser/sync/sync_global_error.cc @@ -15,8 +15,8 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" SyncGlobalError::SyncGlobalError(SyncErrorController* error_controller, diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 8143ca3..e220262 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" diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index 680c5f1..dbee15a 100644 --- a/chrome/browser/sync/sync_ui_util_unittest.cc +++ b/chrome/browser/sync/sync_ui_util_unittest.cc @@ -10,12 +10,12 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/fake_auth_status_provider.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" -#include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock-actions.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |