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

Unified Diff: chrome/browser/ui/webui/options/browser_options_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/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index b038db16223d3c2026841031df813d94f993626a..c4262c69de805addb3c0b8b347ca43ddb4329d68 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -570,7 +570,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
values->Set("profilesInfo", GetProfilesInfoList().release());
values->SetBoolean("profileIsManaged",
- Profile::FromWebUI(web_ui())->IsManaged());
+ Profile::FromWebUI(web_ui())->IsSupervised());
#if !defined(OS_CHROMEOS)
values->SetBoolean(
@@ -826,7 +826,7 @@ void BrowserOptionsHandler::InitializeHandler() {
base::Bind(&BrowserOptionsHandler::SetupFontSizeSelector,
base::Unretained(this)));
profile_pref_registrar_.Add(
- prefs::kManagedUsers,
+ prefs::kSupervisedUsers,
base::Bind(&BrowserOptionsHandler::SetupManagingSupervisedUsers,
base::Unretained(this)));
profile_pref_registrar_.Add(
@@ -1225,7 +1225,7 @@ scoped_ptr<base::ListValue> BrowserOptionsHandler::GetProfilesInfoList() {
profile_value->Set("filePath", base::CreateFilePathValue(profile_path));
profile_value->SetBoolean("isCurrentProfile",
profile_path == current_profile_path);
- profile_value->SetBoolean("isManaged", cache.ProfileIsManagedAtIndex(i));
+ profile_value->SetBoolean("isManaged", cache.ProfileIsSupervisedAtIndex(i));
bool is_gaia_picture =
cache.IsUsingGAIAPictureOfProfileAtIndex(i) &&
@@ -1272,10 +1272,10 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
bool is_system_theme = false;
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- bool profile_is_managed = profile->IsManaged();
+ bool profile_is_supervised = profile->IsSupervised();
is_system_theme = theme_service->UsingSystemTheme();
base::FundamentalValue native_theme_enabled(!is_system_theme &&
- !profile_is_managed);
+ !profile_is_supervised);
web_ui()->CallJavascriptFunction("BrowserOptions.setNativeThemeButtonEnabled",
native_theme_enabled);
#endif
@@ -1334,7 +1334,7 @@ BrowserOptionsHandler::GetSyncStateDictionary() {
return sync_status.Pass();
}
- sync_status->SetBoolean("supervisedUser", profile->IsManaged());
+ sync_status->SetBoolean("supervisedUser", profile->IsSupervised());
bool signout_prohibited = false;
#if !defined(OS_CHROMEOS)
@@ -1740,7 +1740,7 @@ void BrowserOptionsHandler::SetupManageCertificatesSection() {
void BrowserOptionsHandler::SetupManagingSupervisedUsers() {
bool has_users = !Profile::FromWebUI(web_ui())->
- GetPrefs()->GetDictionary(prefs::kManagedUsers)->empty();
+ GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
base::FundamentalValue has_users_value(has_users);
web_ui()->CallJavascriptFunction(
"BrowserOptions.updateManagesSupervisedUsers",
« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_resource_cache.cc ('k') | chrome/browser/ui/webui/options/clear_browser_data_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698