Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 1405383006: [sync] Componentize strings used by ProfileSyncService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_switches_strings
Patch Set: Rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 12 matching lines...) Expand all
23 #include "base/single_thread_task_runner.h" 23 #include "base/single_thread_task_runner.h"
24 #include "base/strings/string16.h" 24 #include "base/strings/string16.h"
25 #include "base/strings/stringprintf.h" 25 #include "base/strings/stringprintf.h"
26 #include "base/thread_task_runner_handle.h" 26 #include "base/thread_task_runner_handle.h"
27 #include "base/threading/thread_restrictions.h" 27 #include "base/threading/thread_restrictions.h"
28 #include "base/time/time.h" 28 #include "base/time/time.h"
29 #include "build/build_config.h" 29 #include "build/build_config.h"
30 #include "chrome/browser/sync/glue/sync_backend_host.h" 30 #include "chrome/browser/sync/glue/sync_backend_host.h"
31 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" 31 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
32 #include "chrome/browser/sync/sync_type_preference_provider.h" 32 #include "chrome/browser/sync/sync_type_preference_provider.h"
33 #include "chrome/grit/generated_resources.h"
34 #include "components/autofill/core/common/autofill_pref_names.h" 33 #include "components/autofill/core/common/autofill_pref_names.h"
35 #include "components/browser_sync/common/browser_sync_switches.h" 34 #include "components/browser_sync/common/browser_sync_switches.h"
36 #include "components/history/core/browser/typed_url_data_type_controller.h" 35 #include "components/history/core/browser/typed_url_data_type_controller.h"
37 #include "components/invalidation/impl/invalidation_prefs.h" 36 #include "components/invalidation/impl/invalidation_prefs.h"
38 #include "components/invalidation/public/invalidation_service.h" 37 #include "components/invalidation/public/invalidation_service.h"
39 #include "components/pref_registry/pref_registry_syncable.h" 38 #include "components/pref_registry/pref_registry_syncable.h"
40 #include "components/signin/core/browser/about_signin_internals.h" 39 #include "components/signin/core/browser/about_signin_internals.h"
41 #include "components/signin/core/browser/profile_oauth2_token_service.h" 40 #include "components/signin/core/browser/profile_oauth2_token_service.h"
42 #include "components/signin/core/browser/signin_manager.h" 41 #include "components/signin/core/browser/signin_manager.h"
43 #include "components/signin/core/browser/signin_metrics.h" 42 #include "components/signin/core/browser/signin_metrics.h"
43 #include "components/strings/grit/components_strings.h"
44 #include "components/sync_driver/backend_migrator.h" 44 #include "components/sync_driver/backend_migrator.h"
45 #include "components/sync_driver/change_processor.h" 45 #include "components/sync_driver/change_processor.h"
46 #include "components/sync_driver/data_type_controller.h" 46 #include "components/sync_driver/data_type_controller.h"
47 #include "components/sync_driver/device_info.h" 47 #include "components/sync_driver/device_info.h"
48 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h" 48 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"
49 #include "components/sync_driver/pref_names.h" 49 #include "components/sync_driver/pref_names.h"
50 #include "components/sync_driver/signin_manager_wrapper.h" 50 #include "components/sync_driver/signin_manager_wrapper.h"
51 #include "components/sync_driver/sync_api_component_factory.h" 51 #include "components/sync_driver/sync_api_component_factory.h"
52 #include "components/sync_driver/sync_client.h" 52 #include "components/sync_driver/sync_client.h"
53 #include "components/sync_driver/sync_driver_switches.h" 53 #include "components/sync_driver/sync_driver_switches.h"
(...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after
2696 } 2696 }
2697 2697
2698 std::string ProfileSyncService::unrecoverable_error_message() const { 2698 std::string ProfileSyncService::unrecoverable_error_message() const {
2699 return unrecoverable_error_message_; 2699 return unrecoverable_error_message_;
2700 } 2700 }
2701 2701
2702 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() 2702 tracked_objects::Location ProfileSyncService::unrecoverable_error_location()
2703 const { 2703 const {
2704 return unrecoverable_error_location_; 2704 return unrecoverable_error_location_;
2705 } 2705 }
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698