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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rerererebase Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/pending_enables.cc ('k') | chrome/browser/profiles/profile.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/browser/profiles/profile_info_cache.h" 64 #include "chrome/browser/profiles/profile_info_cache.h"
65 #include "chrome/browser/profiles/profiles_state.h" 65 #include "chrome/browser/profiles/profiles_state.h"
66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
67 #include "chrome/browser/renderer_host/web_cache_manager.h" 67 #include "chrome/browser/renderer_host/web_cache_manager.h"
68 #include "chrome/browser/search/search.h" 68 #include "chrome/browser/search/search.h"
69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
70 #include "chrome/browser/services/gcm/gcm_profile_service.h" 70 #include "chrome/browser/services/gcm/gcm_profile_service.h"
71 #include "chrome/browser/signin/easy_unlock_controller.h" 71 #include "chrome/browser/signin/easy_unlock_controller.h"
72 #include "chrome/browser/signin/signin_manager_factory.h" 72 #include "chrome/browser/signin/signin_manager_factory.h"
73 #include "chrome/browser/signin/signin_promo.h" 73 #include "chrome/browser/signin/signin_promo.h"
74 #include "chrome/browser/sync/sync_prefs.h"
75 #include "chrome/browser/task_manager/task_manager.h" 74 #include "chrome/browser/task_manager/task_manager.h"
76 #include "chrome/browser/ui/app_list/app_list_service.h" 75 #include "chrome/browser/ui/app_list/app_list_service.h"
77 #include "chrome/browser/ui/browser_ui_prefs.h" 76 #include "chrome/browser/ui/browser_ui_prefs.h"
78 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 77 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
79 #include "chrome/browser/ui/network_profile_bubble.h" 78 #include "chrome/browser/ui/network_profile_bubble.h"
80 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 79 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
81 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 80 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
82 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 81 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
83 #include "chrome/browser/ui/startup/default_browser_prompt.h" 82 #include "chrome/browser/ui/startup/default_browser_prompt.h"
84 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 83 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
85 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 84 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
86 #include "chrome/browser/ui/webui/flags_ui.h" 85 #include "chrome/browser/ui/webui/flags_ui.h"
87 #include "chrome/browser/ui/webui/instant_ui.h" 86 #include "chrome/browser/ui/webui/instant_ui.h"
88 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 87 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
89 #include "chrome/browser/ui/webui/plugins_ui.h" 88 #include "chrome/browser/ui/webui/plugins_ui.h"
90 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 89 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
91 #include "chrome/browser/upgrade_detector.h" 90 #include "chrome/browser/upgrade_detector.h"
92 #include "chrome/browser/web_resource/promo_resource_service.h" 91 #include "chrome/browser/web_resource/promo_resource_service.h"
93 #include "chrome/common/metrics/caching_permuted_entropy_provider.h" 92 #include "chrome/common/metrics/caching_permuted_entropy_provider.h"
94 #include "chrome/common/pref_names.h" 93 #include "chrome/common/pref_names.h"
95 #include "components/autofill/core/browser/autofill_manager.h" 94 #include "components/autofill/core/browser/autofill_manager.h"
96 #include "components/password_manager/core/browser/password_manager.h" 95 #include "components/password_manager/core/browser/password_manager.h"
97 #include "components/rappor/rappor_service.h" 96 #include "components/rappor/rappor_service.h"
97 #include "components/sync_driver/sync_prefs.h"
98 #include "components/translate/core/browser/translate_prefs.h" 98 #include "components/translate/core/browser/translate_prefs.h"
99 #include "components/user_prefs/pref_registry_syncable.h" 99 #include "components/user_prefs/pref_registry_syncable.h"
100 #include "content/public/browser/render_process_host.h" 100 #include "content/public/browser/render_process_host.h"
101 #include "extensions/browser/extension_prefs.h" 101 #include "extensions/browser/extension_prefs.h"
102 102
103 #if defined(ENABLE_AUTOFILL_DIALOG) 103 #if defined(ENABLE_AUTOFILL_DIALOG)
104 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" 104 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
105 #endif 105 #endif
106 106
107 #if defined(ENABLE_CONFIGURATION_POLICY) 107 #if defined(ENABLE_CONFIGURATION_POLICY)
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 } 333 }
334 334
335 // Register prefs applicable to all profiles. 335 // Register prefs applicable to all profiles.
336 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 336 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
337 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 337 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
338 // User prefs. Please keep this list alphabetized. 338 // User prefs. Please keep this list alphabetized.
339 apps::RegisterProfilePrefs(registry); 339 apps::RegisterProfilePrefs(registry);
340 autofill::AutofillManager::RegisterProfilePrefs(registry); 340 autofill::AutofillManager::RegisterProfilePrefs(registry);
341 BookmarkPromptPrefs::RegisterProfilePrefs(registry); 341 BookmarkPromptPrefs::RegisterProfilePrefs(registry);
342 bookmark_utils::RegisterProfilePrefs(registry); 342 bookmark_utils::RegisterProfilePrefs(registry);
343 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); 343 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
344 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 344 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
345 ChromeVersionService::RegisterProfilePrefs(registry); 345 ChromeVersionService::RegisterProfilePrefs(registry);
346 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 346 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
347 registry); 347 registry);
348 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 348 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
349 chrome_prefs::RegisterProfilePrefs(registry); 349 chrome_prefs::RegisterProfilePrefs(registry);
350 DownloadPrefs::RegisterProfilePrefs(registry); 350 DownloadPrefs::RegisterProfilePrefs(registry);
351 EasyUnlockController::RegisterProfilePrefs(registry); 351 EasyUnlockController::RegisterProfilePrefs(registry);
352 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 352 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
353 extensions::launch_util::RegisterProfilePrefs(registry); 353 extensions::launch_util::RegisterProfilePrefs(registry);
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 594 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
595 current_version); 595 current_version);
596 } 596 }
597 597
598 #if defined(OS_CHROMEOS) 598 #if defined(OS_CHROMEOS)
599 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 599 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
600 #endif 600 #endif
601 } 601 }
602 602
603 } // namespace chrome 603 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/pending_enables.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698