Rename "managed (mode|user)" to "supervised user" (part 2)
Followup to https://codereview.chromium.org/316863002/
This CL changes:
- c/b/managed_mode/ to c/b/supervised_user/
- "ManagedMode"/"ManagedUser" to "SupervisedUser" in c/b/supervised_user/
Still missing:
- Some stuff outside of c/b/supervised_user/, mostly (but not only) c/b/chromeos/login/managed/
- JavaScript
- Resource names
The remaining things will come in followup CLs.
[email protected] (c/b/chromeos)
[email protected] (c/b/profiles)
[email protected] (rest of c/)
All the TBRs are just trivial renames.
BUG=385113
Review URL: https://codereview.chromium.org/335833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277750 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 6c10c4d..00fab138 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 @@
#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 @@
TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);
#if defined(ENABLE_MANAGED_USERS)
- ManagedUserService::MigrateUserPrefs(prefs);
+ SupervisedUserService::MigrateUserPrefs(prefs);
#endif
#if defined(OS_MACOSX) && !defined(OS_IOS)
