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

Unified Diff: chrome/browser/ui/webui/options/manage_profile_handler.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
Index: chrome/browser/ui/webui/options/manage_profile_handler.cc
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index d25446a76b31f943746294d088282ecc462484da..61e1e4d5bd660175cc540a909bb80945f870047f 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -137,8 +137,8 @@ void ManageProfileHandler::InitializeHandler() {
Profile* profile = Profile::FromWebUI(web_ui());
pref_change_registrar_.Init(profile->GetPrefs());
pref_change_registrar_.Add(
- prefs::kManagedUserCreationAllowed,
- base::Bind(&ManageProfileHandler::OnCreateManagedUserPrefChange,
+ prefs::kSupervisedUserCreationAllowed,
+ base::Bind(&ManageProfileHandler::OnCreateSupervisedUserPrefChange,
base::Unretained(this)));
ProfileSyncService* service =
ProfileSyncServiceFactory::GetForProfile(profile);
@@ -149,7 +149,7 @@ void ManageProfileHandler::InitializeHandler() {
void ManageProfileHandler::InitializePage() {
SendExistingProfileNames();
- OnCreateManagedUserPrefChange();
+ OnCreateSupervisedUserPrefChange();
}
void ManageProfileHandler::RegisterMessages() {
@@ -358,7 +358,7 @@ void ManageProfileHandler::SetProfileIconAndName(const base::ListValue* args) {
}
ProfileMetrics::LogProfileUpdate(profile_file_path);
- if (profile->IsManaged())
+ if (profile->IsSupervised())
return;
base::string16 new_profile_name;
@@ -472,13 +472,13 @@ void ManageProfileHandler::RequestCreateProfileUpdate(
GenerateSignedinUserSpecificStrings(&replacements);
web_ui()->CallJavascriptFunction("loadTimeData.overrideValues", replacements);
- OnCreateManagedUserPrefChange();
+ OnCreateSupervisedUserPrefChange();
}
-void ManageProfileHandler::OnCreateManagedUserPrefChange() {
+void ManageProfileHandler::OnCreateSupervisedUserPrefChange() {
PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
base::FundamentalValue allowed(
- prefs->GetBoolean(prefs::kManagedUserCreationAllowed));
+ prefs->GetBoolean(prefs::kSupervisedUserCreationAllowed));
web_ui()->CallJavascriptFunction(
"CreateProfileOverlay.updateManagedUsersAllowed", allowed);
}

Powered by Google App Engine
This is Rietveld 408576698