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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2805833002: Migrate Cryptauth*Managers RegisterPrefs to CryptAuthService::RegisterProfilePrefs. (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/signin/easy_unlock_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 902042210ea2701c083152aaa034f88b1cad6490..2896f14bf9d7f0af35420f3fdfb53b68ef84cdd6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -73,6 +73,7 @@
#include "components/browsing_data/core/pref_names.h"
#include "components/certificate_transparency/ct_policy_manager.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
+#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.
#include "components/dom_distiller/core/distilled_page_prefs.h"
#include "components/doodle/doodle_service.h"
#include "components/flags_ui/pref_service_flags_storage.h"
@@ -226,6 +227,8 @@
#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chromeos/audio/audio_devices_pref_handler_impl.h"
+#include "chromeos/chromeos_switches.h"
+#include "chromeos/components/tether/initializer.h"
#include "chromeos/network/proxy/proxy_config_handler.h"
#include "chromeos/timezone/timezone_resolver.h"
#include "components/invalidation/impl/invalidator_storage.h"
@@ -514,6 +517,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
policy::URLBlacklistManager::RegisterProfilePrefs(registry);
certificate_transparency::CTPolicyManager::RegisterPrefs(registry);
+#if BUILDFLAG(ENABLE_EXTENSIONS) || defined(OS_CHROMEOS)
+ cryptauth::CryptAuthService::RegisterProfilePrefs(registry);
+#endif
+
#if BUILDFLAG(ENABLE_EXTENSIONS)
EasyUnlockService::RegisterProfilePrefs(registry);
ExtensionWebUI::RegisterProfilePrefs(registry);
@@ -607,6 +614,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry);
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kEnableTether)) {
+ chromeos::tether::Initializer::RegisterProfilePrefs(registry);
+ }
chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
« 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