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

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 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity 25 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

« chrome/browser/supervised_user/supervised_user_sync_service.cc ('K') | « chrome/browser/sync/managed_user_signin_manager_wrapper.cc ('k') | chrome/browser/sync/sessions/notification_service_sessions_router.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 f1da600436e589efcb84d6b14f737224e4e7e840..125bb558f1d581ab33c9bcfa8a951f5114b7602a 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc

@@ -77,12 +77,12 @@

#endif

#if defined(ENABLE_MANAGED_USERS)

-#include "chrome/browser/managed_mode/managed_user_settings_service.h"

-#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"

-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"

-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"

-#include "chrome/browser/managed_mode/managed_user_sync_service.h"

-#include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"

+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"

+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"

+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"

+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"

+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"

+#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"

#endif

#if !defined(OS_ANDROID)

@@ -540,13 +540,13 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::

}

#if defined(ENABLE_MANAGED_USERS)

case syncer::SUPERVISED_USER_SETTINGS:

- return ManagedUserSettingsServiceFactory::GetForProfile(profile_)->

+ return SupervisedUserSettingsServiceFactory::GetForProfile(profile_)->

AsWeakPtr();

case syncer::SUPERVISED_USERS:

- return ManagedUserSyncServiceFactory::GetForProfile(profile_)->

+ return SupervisedUserSyncServiceFactory::GetForProfile(profile_)->

AsWeakPtr();

case syncer::SUPERVISED_USER_SHARED_SETTINGS:

- return ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(

+ return SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(

profile_)->AsWeakPtr();

#endif

case syncer::ARTICLES: {