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

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 587ae92107a2b251b5d6418b8d7a89fb6e53583f..e1e268bdd9f7b329bc324dba2060803d701568a3 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -251,12 +251,12 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
}
#if defined(ENABLE_MANAGED_USERS)
- if (profile_->IsManaged()) {
+ if (profile_->IsSupervised()) {
pss->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
- syncer::MANAGED_USER_SETTINGS,
+ syncer::SUPERVISED_USER_SETTINGS,
this,
pss));
} else {
@@ -264,7 +264,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
- syncer::MANAGED_USERS,
+ syncer::SUPERVISED_USERS,
this,
pss));
}
@@ -272,7 +272,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
- syncer::MANAGED_USER_SHARED_SETTINGS,
+ syncer::SUPERVISED_USER_SHARED_SETTINGS,
this,
pss));
#endif
@@ -512,13 +512,13 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::
: base::WeakPtr<syncer::SyncableService>();
}
#if defined(ENABLE_MANAGED_USERS)
- case syncer::MANAGED_USER_SETTINGS:
+ case syncer::SUPERVISED_USER_SETTINGS:
return ManagedUserSettingsServiceFactory::GetForProfile(profile_)->
AsWeakPtr();
- case syncer::MANAGED_USERS:
+ case syncer::SUPERVISED_USERS:
return ManagedUserSyncServiceFactory::GetForProfile(profile_)->
AsWeakPtr();
- case syncer::MANAGED_USER_SHARED_SETTINGS:
+ case syncer::SUPERVISED_USER_SHARED_SETTINGS:
return ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(
profile_)->AsWeakPtr();
#endif

Powered by Google App Engine
This is Rietveld 408576698