Chromium Code Reviews| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" | 220 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" |
| 221 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" | 221 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| 222 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 222 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| 223 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 223 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
| 224 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" | 224 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" |
| 225 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" | 225 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
| 226 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 226 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
| 227 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 227 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 228 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 228 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| 229 #include "chromeos/chromeos_switches.h" | 229 #include "chromeos/chromeos_switches.h" |
| 230 #include "chromeos/components/tether/initializer.h" | |
| 231 #include "chromeos/network/proxy/proxy_config_handler.h" | 230 #include "chromeos/network/proxy/proxy_config_handler.h" |
| 232 #include "chromeos/timezone/timezone_resolver.h" | 231 #include "chromeos/timezone/timezone_resolver.h" |
| 233 #include "components/invalidation/impl/invalidator_storage.h" | 232 #include "components/invalidation/impl/invalidator_storage.h" |
| 234 #include "components/onc/onc_pref_names.h" | 233 #include "components/onc/onc_pref_names.h" |
| 235 #include "components/quirks/quirks_manager.h" | 234 #include "components/quirks/quirks_manager.h" |
| 236 #else | 235 #else |
| 237 #include "chrome/browser/extensions/default_apps.h" | 236 #include "chrome/browser/extensions/default_apps.h" |
| 238 #endif | 237 #endif |
| 239 | 238 |
| 240 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) | 239 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) |
| 241 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" | 240 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
| 242 #endif | 241 #endif |
| 243 | 242 |
| 244 #if defined(OS_CHROMEOS) || BUILDFLAG(ENABLE_EXTENSIONS) | |
| 245 #include "components/cryptauth/cryptauth_service.h" | |
| 246 #endif | |
| 247 | |
| 248 #if defined(OS_MACOSX) | 243 #if defined(OS_MACOSX) |
| 249 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" | 244 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" |
| 250 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 245 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 251 #endif | 246 #endif |
| 252 | 247 |
| 253 #if defined(OS_WIN) | 248 #if defined(OS_WIN) |
| 254 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 249 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 255 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" | 250 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" |
| 256 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h" | 251 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h" |
| 257 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" | 252 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 513 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 508 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| 514 translate::LanguageModel::RegisterProfilePrefs(registry); | 509 translate::LanguageModel::RegisterProfilePrefs(registry); |
| 515 translate::TranslatePrefs::RegisterProfilePrefs(registry); | 510 translate::TranslatePrefs::RegisterProfilePrefs(registry); |
| 516 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry); | 511 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry); |
| 517 ZeroSuggestProvider::RegisterProfilePrefs(registry); | 512 ZeroSuggestProvider::RegisterProfilePrefs(registry); |
| 518 browsing_data::prefs::RegisterBrowserUserPrefs(registry); | 513 browsing_data::prefs::RegisterBrowserUserPrefs(registry); |
| 519 | 514 |
| 520 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 515 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
| 521 certificate_transparency::CTPolicyManager::RegisterPrefs(registry); | 516 certificate_transparency::CTPolicyManager::RegisterPrefs(registry); |
| 522 | 517 |
| 523 #if BUILDFLAG(ENABLE_EXTENSIONS) || defined(OS_CHROMEOS) | |
| 524 cryptauth::CryptAuthService::RegisterProfilePrefs(registry); | |
| 525 #endif | |
| 526 | |
| 527 #if BUILDFLAG(ENABLE_EXTENSIONS) | 518 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 528 EasyUnlockService::RegisterProfilePrefs(registry); | |
| 529 ExtensionWebUI::RegisterProfilePrefs(registry); | 519 ExtensionWebUI::RegisterProfilePrefs(registry); |
| 530 RegisterAnimationPolicyPrefs(registry); | 520 RegisterAnimationPolicyPrefs(registry); |
| 531 ToolbarActionsBar::RegisterProfilePrefs(registry); | 521 ToolbarActionsBar::RegisterProfilePrefs(registry); |
| 532 extensions::ActivityLog::RegisterProfilePrefs(registry); | 522 extensions::ActivityLog::RegisterProfilePrefs(registry); |
| 533 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 523 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
| 534 extensions::launch_util::RegisterProfilePrefs(registry); | 524 extensions::launch_util::RegisterProfilePrefs(registry); |
| 535 extensions::RuntimeAPI::RegisterPrefs(registry); | 525 extensions::RuntimeAPI::RegisterPrefs(registry); |
| 536 #endif // BUILDFLAG(ENABLE_EXTENSIONS) | 526 #endif // BUILDFLAG(ENABLE_EXTENSIONS) |
| 537 | 527 |
| 538 #if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID) | 528 #if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID) |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 610 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 600 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
| 611 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 601 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
| 612 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 602 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
| 613 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry); | 603 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry); |
| 614 chromeos::Preferences::RegisterProfilePrefs(registry); | 604 chromeos::Preferences::RegisterProfilePrefs(registry); |
| 615 chromeos::PrintersManager::RegisterProfilePrefs(registry); | 605 chromeos::PrintersManager::RegisterProfilePrefs(registry); |
| 616 chromeos::quick_unlock::RegisterProfilePrefs(registry); | 606 chromeos::quick_unlock::RegisterProfilePrefs(registry); |
| 617 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 607 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
| 618 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 608 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
| 619 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry); | 609 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry); |
| 620 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 621 chromeos::switches::kEnableTether)) { | |
| 622 chromeos::tether::Initializer::RegisterProfilePrefs(registry); | |
|
Kyle Horimoto
2017/04/14 00:15:43
When is RegisterProfilePrefs() actually called now
Ryan Hansberry
2017/04/14 02:34:10
When we call DependsOn() in our ServiceFactories,
| |
| 623 } | |
| 624 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 610 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
| 625 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); | 611 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); |
| 626 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 612 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
| 627 policy::DeviceStatusCollector::RegisterProfilePrefs(registry); | 613 policy::DeviceStatusCollector::RegisterProfilePrefs(registry); |
| 628 ::onc::RegisterProfilePrefs(registry); | 614 ::onc::RegisterProfilePrefs(registry); |
| 629 #endif | 615 #endif |
| 630 | 616 |
| 631 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) | 617 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) |
| 632 ArcAppListPrefs::RegisterProfilePrefs(registry); | 618 ArcAppListPrefs::RegisterProfilePrefs(registry); |
| 633 #endif | 619 #endif |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 822 } | 808 } |
| 823 | 809 |
| 824 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { | 810 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { |
| 825 auto pref_stores = ExpectedPrefStores(); | 811 auto pref_stores = ExpectedPrefStores(); |
| 826 pref_stores.erase(PrefValueStore::DEFAULT_STORE); | 812 pref_stores.erase(PrefValueStore::DEFAULT_STORE); |
| 827 pref_stores.erase(PrefValueStore::USER_STORE); | 813 pref_stores.erase(PrefValueStore::USER_STORE); |
| 828 return pref_stores; | 814 return pref_stores; |
| 829 } | 815 } |
| 830 | 816 |
| 831 } // namespace chrome | 817 } // namespace chrome |
| OLD | NEW |