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

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

Issue 2805833002: Migrate Cryptauth*Managers RegisterPrefs to CryptAuthService::RegisterProfilePrefs. (Closed)
Patch Set: Replace initializer_unittest RegisterPrefs calls with Initializer::RegisterProfilePrefs. Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/signin/easy_unlock_service.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 <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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 #include "chrome/browser/chromeos/system/input_device_settings.h" 219 #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" 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"
230 #include "chromeos/components/tether/initializer.h"
229 #include "chromeos/network/proxy/proxy_config_handler.h" 231 #include "chromeos/network/proxy/proxy_config_handler.h"
230 #include "chromeos/timezone/timezone_resolver.h" 232 #include "chromeos/timezone/timezone_resolver.h"
231 #include "components/invalidation/impl/invalidator_storage.h" 233 #include "components/invalidation/impl/invalidator_storage.h"
232 #include "components/onc/onc_pref_names.h" 234 #include "components/onc/onc_pref_names.h"
233 #include "components/quirks/quirks_manager.h" 235 #include "components/quirks/quirks_manager.h"
234 #else 236 #else
235 #include "chrome/browser/extensions/default_apps.h" 237 #include "chrome/browser/extensions/default_apps.h"
236 #endif 238 #endif
237 239
238 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 240 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
239 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 241 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
240 #endif 242 #endif
241 243
244 #if defined(OS_CHROMEOS) || BUILDFLAG(ENABLE_EXTENSIONS)
245 #include "components/cryptauth/cryptauth_service.h"
246 #endif
247
242 #if defined(OS_MACOSX) 248 #if defined(OS_MACOSX)
243 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 249 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
244 #include "chrome/browser/ui/cocoa/confirm_quit.h" 250 #include "chrome/browser/ui/cocoa/confirm_quit.h"
245 #endif 251 #endif
246 252
247 #if defined(OS_WIN) 253 #if defined(OS_WIN)
248 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" 254 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
249 #include "chrome/browser/component_updater/sw_reporter_installer_win.h" 255 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
250 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h" 256 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prom pt_prefs_manager.h"
251 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h" 257 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_util.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 513 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
508 translate::LanguageModel::RegisterProfilePrefs(registry); 514 translate::LanguageModel::RegisterProfilePrefs(registry);
509 translate::TranslatePrefs::RegisterProfilePrefs(registry); 515 translate::TranslatePrefs::RegisterProfilePrefs(registry);
510 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry); 516 UINetworkQualityEstimatorService::RegisterProfilePrefs(registry);
511 ZeroSuggestProvider::RegisterProfilePrefs(registry); 517 ZeroSuggestProvider::RegisterProfilePrefs(registry);
512 browsing_data::prefs::RegisterBrowserUserPrefs(registry); 518 browsing_data::prefs::RegisterBrowserUserPrefs(registry);
513 519
514 policy::URLBlacklistManager::RegisterProfilePrefs(registry); 520 policy::URLBlacklistManager::RegisterProfilePrefs(registry);
515 certificate_transparency::CTPolicyManager::RegisterPrefs(registry); 521 certificate_transparency::CTPolicyManager::RegisterPrefs(registry);
516 522
523 #if BUILDFLAG(ENABLE_EXTENSIONS) || defined(OS_CHROMEOS)
524 cryptauth::CryptAuthService::RegisterProfilePrefs(registry);
525 #endif
526
517 #if BUILDFLAG(ENABLE_EXTENSIONS) 527 #if BUILDFLAG(ENABLE_EXTENSIONS)
518 EasyUnlockService::RegisterProfilePrefs(registry); 528 EasyUnlockService::RegisterProfilePrefs(registry);
519 ExtensionWebUI::RegisterProfilePrefs(registry); 529 ExtensionWebUI::RegisterProfilePrefs(registry);
520 RegisterAnimationPolicyPrefs(registry); 530 RegisterAnimationPolicyPrefs(registry);
521 ToolbarActionsBar::RegisterProfilePrefs(registry); 531 ToolbarActionsBar::RegisterProfilePrefs(registry);
522 extensions::ActivityLog::RegisterProfilePrefs(registry); 532 extensions::ActivityLog::RegisterProfilePrefs(registry);
523 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 533 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
524 extensions::launch_util::RegisterProfilePrefs(registry); 534 extensions::launch_util::RegisterProfilePrefs(registry);
525 extensions::RuntimeAPI::RegisterPrefs(registry); 535 extensions::RuntimeAPI::RegisterPrefs(registry);
526 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 536 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 chromeos::file_system_provider::RegisterProfilePrefs(registry); 610 chromeos::file_system_provider::RegisterProfilePrefs(registry);
601 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 611 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
602 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 612 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
603 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry); 613 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry);
604 chromeos::Preferences::RegisterProfilePrefs(registry); 614 chromeos::Preferences::RegisterProfilePrefs(registry);
605 chromeos::PrintersManager::RegisterProfilePrefs(registry); 615 chromeos::PrintersManager::RegisterProfilePrefs(registry);
606 chromeos::quick_unlock::RegisterProfilePrefs(registry); 616 chromeos::quick_unlock::RegisterProfilePrefs(registry);
607 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 617 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
608 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 618 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
609 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry); 619 chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry);
620 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
621 chromeos::switches::kEnableTether)) {
622 chromeos::tether::Initializer::RegisterProfilePrefs(registry);
623 }
610 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 624 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
611 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry); 625 extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
612 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry); 626 flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
613 policy::DeviceStatusCollector::RegisterProfilePrefs(registry); 627 policy::DeviceStatusCollector::RegisterProfilePrefs(registry);
614 ::onc::RegisterProfilePrefs(registry); 628 ::onc::RegisterProfilePrefs(registry);
615 #endif 629 #endif
616 630
617 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST) 631 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
618 ArcAppListPrefs::RegisterProfilePrefs(registry); 632 ArcAppListPrefs::RegisterProfilePrefs(registry);
619 #endif 633 #endif
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 } 822 }
809 823
810 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { 824 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() {
811 auto pref_stores = ExpectedPrefStores(); 825 auto pref_stores = ExpectedPrefStores();
812 pref_stores.erase(PrefValueStore::DEFAULT_STORE); 826 pref_stores.erase(PrefValueStore::DEFAULT_STORE);
813 pref_stores.erase(PrefValueStore::USER_STORE); 827 pref_stores.erase(PrefValueStore::USER_STORE);
814 return pref_stores; 828 return pref_stores;
815 } 829 }
816 830
817 } // namespace chrome 831 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/signin/easy_unlock_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698