OLD | NEW |
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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 #include "chrome/browser/printing/print_dialog_cloud.h" | 52 #include "chrome/browser/printing/print_dialog_cloud.h" |
53 #include "chrome/browser/profiles/chrome_version_service.h" | 53 #include "chrome/browser/profiles/chrome_version_service.h" |
54 #include "chrome/browser/profiles/profile.h" | 54 #include "chrome/browser/profiles/profile.h" |
55 #include "chrome/browser/profiles/profile_impl.h" | 55 #include "chrome/browser/profiles/profile_impl.h" |
56 #include "chrome/browser/profiles/profile_info_cache.h" | 56 #include "chrome/browser/profiles/profile_info_cache.h" |
57 #include "chrome/browser/profiles/profiles_state.h" | 57 #include "chrome/browser/profiles/profiles_state.h" |
58 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" | 58 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" |
59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
60 #include "chrome/browser/search/search.h" | 60 #include "chrome/browser/search/search.h" |
61 #include "chrome/browser/signin/signin_manager_factory.h" | 61 #include "chrome/browser/signin/signin_manager_factory.h" |
62 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" | |
63 #include "chrome/browser/task_manager/task_manager.h" | 62 #include "chrome/browser/task_manager/task_manager.h" |
64 #include "chrome/browser/ui/app_list/app_list_prefs.h" | 63 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
65 #include "chrome/browser/ui/app_list/app_list_service.h" | 64 #include "chrome/browser/ui/app_list/app_list_service.h" |
66 #include "chrome/browser/ui/browser_ui_prefs.h" | 65 #include "chrome/browser/ui/browser_ui_prefs.h" |
67 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 66 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
68 #include "chrome/browser/ui/network_profile_bubble.h" | 67 #include "chrome/browser/ui/network_profile_bubble.h" |
69 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" | 68 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" |
70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 69 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 70 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
72 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 71 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 #include "chrome/browser/extensions/api/copresence/copresence_api.h" | 126 #include "chrome/browser/extensions/api/copresence/copresence_api.h" |
128 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 127 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
129 #endif | 128 #endif |
130 #endif // defined(ENABLE_EXTENSIONS) | 129 #endif // defined(ENABLE_EXTENSIONS) |
131 | 130 |
132 #if defined(ENABLE_PLUGIN_INSTALLATION) | 131 #if defined(ENABLE_PLUGIN_INSTALLATION) |
133 #include "chrome/browser/plugins/plugins_resource_service.h" | 132 #include "chrome/browser/plugins/plugins_resource_service.h" |
134 #endif | 133 #endif |
135 | 134 |
136 #if defined(ENABLE_SUPERVISED_USERS) | 135 #if defined(ENABLE_SUPERVISED_USERS) |
| 136 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
137 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 137 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
138 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" | 138 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" |
139 #include "chrome/browser/supervised_user/supervised_user_service.h" | 139 #include "chrome/browser/supervised_user/supervised_user_service.h" |
140 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 140 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
141 #endif | 141 #endif |
142 | 142 |
143 #if defined(ENABLE_SERVICE_DISCOVERY) | 143 #if defined(ENABLE_SERVICE_DISCOVERY) |
144 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 144 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
145 #endif | 145 #endif |
146 | 146 |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 } | 366 } |
367 | 367 |
368 // Register prefs applicable to all profiles. | 368 // Register prefs applicable to all profiles. |
369 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 369 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
370 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs"); | 370 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs"); |
371 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime"); | 371 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime"); |
372 // User prefs. Please keep this list alphabetized. | 372 // User prefs. Please keep this list alphabetized. |
373 autofill::AutofillManager::RegisterProfilePrefs(registry); | 373 autofill::AutofillManager::RegisterProfilePrefs(registry); |
374 bookmarks::RegisterProfilePrefs(registry); | 374 bookmarks::RegisterProfilePrefs(registry); |
375 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 375 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
376 ChildAccountService::RegisterProfilePrefs(registry); | |
377 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 376 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
378 ChromeVersionService::RegisterProfilePrefs(registry); | 377 ChromeVersionService::RegisterProfilePrefs(registry); |
379 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( | 378 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( |
380 registry); | 379 registry); |
381 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 380 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
382 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); | 381 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); |
383 chrome_prefs::RegisterProfilePrefs(registry); | 382 chrome_prefs::RegisterProfilePrefs(registry); |
384 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); | 383 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); |
385 DownloadPrefs::RegisterProfilePrefs(registry); | 384 DownloadPrefs::RegisterProfilePrefs(registry); |
386 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry); | 385 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 #if defined(ENABLE_PRINT_PREVIEW) | 445 #if defined(ENABLE_PRINT_PREVIEW) |
447 print_dialog_cloud::RegisterProfilePrefs(registry); | 446 print_dialog_cloud::RegisterProfilePrefs(registry); |
448 printing::StickySettings::RegisterProfilePrefs(registry); | 447 printing::StickySettings::RegisterProfilePrefs(registry); |
449 #endif | 448 #endif |
450 | 449 |
451 #if defined(ENABLE_SERVICE_DISCOVERY) | 450 #if defined(ENABLE_SERVICE_DISCOVERY) |
452 LocalDiscoveryUI::RegisterProfilePrefs(registry); | 451 LocalDiscoveryUI::RegisterProfilePrefs(registry); |
453 #endif | 452 #endif |
454 | 453 |
455 #if defined(ENABLE_SUPERVISED_USERS) | 454 #if defined(ENABLE_SUPERVISED_USERS) |
| 455 ChildAccountService::RegisterProfilePrefs(registry); |
456 SupervisedUserService::RegisterProfilePrefs(registry); | 456 SupervisedUserService::RegisterProfilePrefs(registry); |
457 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); | 457 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); |
458 SupervisedUserSyncService::RegisterProfilePrefs(registry); | 458 SupervisedUserSyncService::RegisterProfilePrefs(registry); |
459 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); | 459 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); |
460 #endif | 460 #endif |
461 | 461 |
462 #if defined(OS_ANDROID) | 462 #if defined(OS_ANDROID) |
463 chrome_variations::VariationsService::RegisterProfilePrefs(registry); | 463 chrome_variations::VariationsService::RegisterProfilePrefs(registry); |
464 NewTabPagePrefs::RegisterProfilePrefs(registry); | 464 NewTabPagePrefs::RegisterProfilePrefs(registry); |
465 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 465 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); | 623 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); |
624 | 624 |
625 // We're done migrating the profile per-host zoom level values, so we clear | 625 // We're done migrating the profile per-host zoom level values, so we clear |
626 // them all. | 626 // them all. |
627 DictionaryPrefUpdate host_zoom_dictionary_update( | 627 DictionaryPrefUpdate host_zoom_dictionary_update( |
628 prefs, prefs::kPerHostZoomLevelsDeprecated); | 628 prefs, prefs::kPerHostZoomLevelsDeprecated); |
629 host_zoom_dictionary_update->Clear(); | 629 host_zoom_dictionary_update->Clear(); |
630 } | 630 } |
631 | 631 |
632 } // namespace chrome | 632 } // namespace chrome |
OLD | NEW |