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 c3b1e79fb9afbe55db6e0620f2c86bff9a602481..c7941b48c3563cd260f72fd324d1161715b4b4ab 100644 |
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
@@ -278,7 +278,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
{ "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, |
{ "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, |
{ "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, |
- { "managedUserLabel", IDS_SUPERVISED_USER_AVATAR_LABEL }, |
{ "networkPredictionEnabledDescription", |
IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, |
{ "passwordsAndAutofillGroupName", |
@@ -317,17 +316,18 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
{ "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, |
{ "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, |
{ "sectionTitleVoice", IDS_OPTIONS_VOICE_GROUP_NAME }, |
+ { "settingsTitle", IDS_SETTINGS_TITLE }, |
+ { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, |
{ "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, |
{ "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, |
{ "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, |
{ "spellingPref", IDS_OPTIONS_SPELLING_PREF }, |
{ "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, |
- { "settingsTitle", IDS_SETTINGS_TITLE }, |
- { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, |
{ "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES }, |
{ "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB }, |
{ "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES }, |
{ "suggestPref", IDS_OPTIONS_SUGGEST_PREF }, |
+ { "supervisedUserLabel", IDS_SUPERVISED_USER_AVATAR_LABEL }, |
{ "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS }, |
{ "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL }, |
{ "themesGallery", IDS_THEMES_GALLERY_BUTTON }, |
@@ -575,7 +575,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
if (ShouldShowMultiProfilesUserList()) |
values->Set("profilesInfo", GetProfilesInfoList().release()); |
- values->SetBoolean("profileIsManaged", |
+ values->SetBoolean("profileIsSupervised", |
Profile::FromWebUI(web_ui())->IsSupervised()); |
#if !defined(OS_CHROMEOS) |
@@ -1239,7 +1239,8 @@ 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.ProfileIsSupervisedAtIndex(i)); |
+ profile_value->SetBoolean("isSupervised", |
+ cache.ProfileIsSupervisedAtIndex(i)); |
bool is_gaia_picture = |
cache.IsUsingGAIAPictureOfProfileAtIndex(i) && |