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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
66 #include "chrome/browser/ui/webui/flags_ui.h" | 66 #include "chrome/browser/ui/webui/flags_ui.h" |
67 #include "chrome/browser/ui/webui/instant_ui.h" | 67 #include "chrome/browser/ui/webui/instant_ui.h" |
68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
69 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 69 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
70 #include "chrome/common/features.h" | 70 #include "chrome/common/features.h" |
71 #include "chrome/common/pref_names.h" | 71 #include "chrome/common/pref_names.h" |
72 #include "components/autofill/core/browser/autofill_manager.h" | 72 #include "components/autofill/core/browser/autofill_manager.h" |
73 #include "components/browsing_data/core/pref_names.h" | 73 #include "components/browsing_data/core/pref_names.h" |
74 #include "components/certificate_transparency/ct_policy_manager.h" | 74 #include "components/certificate_transparency/ct_policy_manager.h" |
75 #include "components/content_settings/core/browser/host_content_settings_map.h" | 75 #include "components/content_settings/core/browser/host_content_settings_map.h" |
76 #include "components/cryptauth/cryptauth_service.h" | |
Kyle Horimoto
2017/04/07 16:58:52
Wrap with #if BUILDFLAG(ENABLE_EXTENSIONS) || defi
Tim Song
2017/04/07 17:56:30
I would just put this under defined(OS_CHROMEOS) f
Ryan Hansberry
2017/04/07 18:18:10
Are you sure tengs@? If EasyUnlock is not just on
Tim Song
2017/04/07 20:04:45
Please also move EasyUnlockService::RegisterPrefs(
Ryan Hansberry
2017/04/07 21:00:06
Done.
| |
76 #include "components/dom_distiller/core/distilled_page_prefs.h" | 77 #include "components/dom_distiller/core/distilled_page_prefs.h" |
77 #include "components/doodle/doodle_service.h" | 78 #include "components/doodle/doodle_service.h" |
78 #include "components/flags_ui/pref_service_flags_storage.h" | 79 #include "components/flags_ui/pref_service_flags_storage.h" |
79 #include "components/gcm_driver/gcm_channel_status_syncer.h" | 80 #include "components/gcm_driver/gcm_channel_status_syncer.h" |
80 #include "components/metrics/metrics_service.h" | 81 #include "components/metrics/metrics_service.h" |
81 #include "components/network_time/network_time_tracker.h" | 82 #include "components/network_time/network_time_tracker.h" |
82 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" | 83 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h" |
83 #include "components/ntp_snippets/content_suggestions_service.h" | 84 #include "components/ntp_snippets/content_suggestions_service.h" |
84 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" | 85 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" |
85 #include "components/ntp_snippets/remote/remote_suggestions_scheduler_impl.h" | 86 #include "components/ntp_snippets/remote/remote_suggestions_scheduler_impl.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
219 #include "chrome/browser/chromeos/system/input_device_settings.h" | 220 #include "chrome/browser/chromeos/system/input_device_settings.h" |
220 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" | 221 #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" | 222 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
222 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 223 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
223 #include "chrome/browser/metrics/chromeos_metrics_provider.h" | 224 #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
224 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" | 225 #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" | 226 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
226 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" | 227 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" |
227 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 228 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
228 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 229 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
230 #include "chromeos/chromeos_switches.h" | |
231 #include "chromeos/components/tether/initializer.h" | |
229 #include "chromeos/network/proxy/proxy_config_handler.h" | 232 #include "chromeos/network/proxy/proxy_config_handler.h" |
230 #include "chromeos/timezone/timezone_resolver.h" | 233 #include "chromeos/timezone/timezone_resolver.h" |
231 #include "components/invalidation/impl/invalidator_storage.h" | 234 #include "components/invalidation/impl/invalidator_storage.h" |
232 #include "components/onc/onc_pref_names.h" | 235 #include "components/onc/onc_pref_names.h" |
233 #include "components/quirks/quirks_manager.h" | 236 #include "components/quirks/quirks_manager.h" |
234 #else | 237 #else |
235 #include "chrome/browser/extensions/default_apps.h" | 238 #include "chrome/browser/extensions/default_apps.h" |
236 #endif | 239 #endif |
237 | 240 |
238 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) | 241 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
507 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); | 510 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
508 translate::LanguageModel::RegisterProfilePrefs(registry); | 511 translate::LanguageModel::RegisterProfilePrefs(registry); |
509 translate::TranslatePrefs::RegisterProfilePrefs(registry); | 512 translate::TranslatePrefs::RegisterProfilePrefs(registry); |
510 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry); | 513 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry); |
511 ZeroSuggestProvider::RegisterProfilePrefs(registry); | 514 ZeroSuggestProvider::RegisterProfilePrefs(registry); |
512 browsing_data::prefs::RegisterBrowserUserPrefs(registry); | 515 browsing_data::prefs::RegisterBrowserUserPrefs(registry); |
513 | 516 |
514 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 517 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
515 certificate_transparency::CTPolicyManager::RegisterPrefs(registry); | 518 certificate_transparency::CTPolicyManager::RegisterPrefs(registry); |
516 | 519 |
520 #if BUILDFLAG(ENABLE_EXTENSIONS) || defined(OS_CHROMEOS) | |
521 cryptauth::CryptAuthService::RegisterProfilePrefs(registry); | |
522 #endif | |
523 | |
517 #if BUILDFLAG(ENABLE_EXTENSIONS) | 524 #if BUILDFLAG(ENABLE_EXTENSIONS) |
518 EasyUnlockService::RegisterProfilePrefs(registry); | 525 EasyUnlockService::RegisterProfilePrefs(registry); |
519 ExtensionWebUI::RegisterProfilePrefs(registry); | 526 ExtensionWebUI::RegisterProfilePrefs(registry); |
520 RegisterAnimationPolicyPrefs(registry); | 527 RegisterAnimationPolicyPrefs(registry); |
521 ToolbarActionsBar::RegisterProfilePrefs(registry); | 528 ToolbarActionsBar::RegisterProfilePrefs(registry); |
522 extensions::ActivityLog::RegisterProfilePrefs(registry); | 529 extensions::ActivityLog::RegisterProfilePrefs(registry); |
523 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 530 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
524 extensions::launch_util::RegisterProfilePrefs(registry); | 531 extensions::launch_util::RegisterProfilePrefs(registry); |
525 extensions::RuntimeAPI::RegisterPrefs(registry); | 532 extensions::RuntimeAPI::RegisterPrefs(registry); |
526 #endif // BUILDFLAG(ENABLE_EXTENSIONS) | 533 #endif // BUILDFLAG(ENABLE_EXTENSIONS) |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
600 chromeos::file_system_provider::RegisterProfilePrefs(registry); | 607 chromeos::file_system_provider::RegisterProfilePrefs(registry); |
601 chromeos::KeyPermissions::RegisterProfilePrefs(registry); | 608 chromeos::KeyPermissions::RegisterProfilePrefs(registry); |
602 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); | 609 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); |
603 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry); | 610 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry); |
604 chromeos::Preferences::RegisterProfilePrefs(registry); | 611 chromeos::Preferences::RegisterProfilePrefs(registry); |
605 chromeos::PrintersManager::RegisterProfilePrefs(registry); | 612 chromeos::PrintersManager::RegisterProfilePrefs(registry); |
606 chromeos::quick_unlock::RegisterProfilePrefs(registry); | 613 chromeos::quick_unlock::RegisterProfilePrefs(registry); |
607 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); | 614 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); |
608 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); | 615 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); |
609 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry); | 616 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry); |
617 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
618 chromeos::switches::kEnableTether)) { | |
619 chromeos::tether::Initializer::RegisterProfilePrefs(registry); | |
620 } | |
610 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); | 621 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); |
611 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); | 622 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); |
612 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); | 623 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); |
613 policy::DeviceStatusCollector::RegisterProfilePrefs(registry); | 624 policy::DeviceStatusCollector::RegisterProfilePrefs(registry); |
614 ::onc::RegisterProfilePrefs(registry); | 625 ::onc::RegisterProfilePrefs(registry); |
615 #endif | 626 #endif |
616 | 627 |
617 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) | 628 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) |
618 ArcAppListPrefs::RegisterProfilePrefs(registry); | 629 ArcAppListPrefs::RegisterProfilePrefs(registry); |
619 #endif | 630 #endif |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
808 } | 819 } |
809 | 820 |
810 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { | 821 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { |
811 auto pref_stores = ExpectedPrefStores(); | 822 auto pref_stores = ExpectedPrefStores(); |
812 pref_stores.erase(PrefValueStore::DEFAULT_STORE); | 823 pref_stores.erase(PrefValueStore::DEFAULT_STORE); |
813 pref_stores.erase(PrefValueStore::USER_STORE); | 824 pref_stores.erase(PrefValueStore::USER_STORE); |
814 return pref_stores; | 825 return pref_stores; |
815 } | 826 } |
816 | 827 |
817 } // namespace chrome | 828 } // namespace chrome |
OLD | NEW |