chrome/browser/prefs/browser_prefs.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/prefs/browser_prefs.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:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index a2e5a626a061e26e50d5b2e2c38fd172b88f7e30..74b14468ff8d6325b7d58f106d4da9ca2a73f67a 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -112,9 +112,9 @@

#endif

#if defined(ENABLE_MANAGED_USERS)

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

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

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

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

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

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

#endif

#if defined(ENABLE_SERVICE_DISCOVERY)

@@ -398,9 +398,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

#endif

#if defined(ENABLE_MANAGED_USERS)

- ManagedUserService::RegisterProfilePrefs(registry);

- ManagedUserSharedSettingsService::RegisterProfilePrefs(registry);

- ManagedUserSyncService::RegisterProfilePrefs(registry);

+ SupervisedUserService::RegisterProfilePrefs(registry);

+ SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);

+ SupervisedUserSyncService::RegisterProfilePrefs(registry);

#endif

#if defined(ENABLE_NOTIFICATIONS)

@@ -520,7 +520,7 @@ void MigrateUserPrefs(Profile* profile) {

TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);

#if defined(ENABLE_MANAGED_USERS)

- ManagedUserService::MigrateUserPrefs(prefs);

+ SupervisedUserService::MigrateUserPrefs(prefs);

#endif

#if defined(OS_MACOSX) && !defined(OS_IOS)