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

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: review comments (+ a few other cleanups) 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 6c10c4d66cbca79172160c77cb374f5d9d44f6c2..00fab138ffaf49a30fa98af5d5525dc25a4bae56 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)
« no previous file with comments | « chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698