chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « chrome/browser/sync/managed_user_signin_manager_wrapper.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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