summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authoribraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 14:19:32 +0000
committeribraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 14:19:32 +0000
commit458d5944c40f518e30b9a4e96b7300caf4882092 (patch)
treecb0e5317a6e31dd5abe5121d48f863b13168a817 /chrome/browser/prefs
parent89b2e712e85559ceb5b7df4f9bde7d64fb72c590 (diff)
downloadchromium_src-458d5944c40f518e30b9a4e96b7300caf4882092.zip
chromium_src-458d5944c40f518e30b9a4e96b7300caf4882092.tar.gz
chromium_src-458d5944c40f518e30b9a4e96b7300caf4882092.tar.bz2
Refactoring |ManagedUserRegistrationService| into two classes:
1- |ManagedUsersSyncService| continuously syncs the managed users data type. 2- |ManagedUserRegistrationUtility| holds state for only one managed user registration process. This CL also creates a separate |BrowserContextKeyedService| to download the custodian's profile. BUG=260306 Review URL: https://chromiumcodereview.appspot.com/19482013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index af477f0..da3ed8c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -102,8 +102,8 @@
#endif
#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/managed_mode/managed_user_registration_service.h"
#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_sync_service.h"
#endif
#if defined(OS_MACOSX)
@@ -324,7 +324,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#if defined(ENABLE_MANAGED_USERS)
ManagedUserService::RegisterProfilePrefs(registry);
- ManagedUserRegistrationService::RegisterProfilePrefs(registry);
+ ManagedUserSyncService::RegisterProfilePrefs(registry);
#endif
#if defined(ENABLE_NOTIFICATIONS)