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

Unified Diff: chrome/browser/ui/webui/options/supervised_user_import_handler.cc

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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/supervised_user_import_handler.cc
diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
index f8fc066de9ee0921f6ae10938cf5fc64e1b32a8a..53b65b89879193bd3dbaf8de8713a52a79151f53 100644
--- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
+++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
@@ -67,19 +67,21 @@ void SupervisedUserImportHandler::GetLocalizedValues(
DCHECK(localized_strings);
static OptionsStringResource resources[] = {
- { "managedUserImportTitle", IDS_IMPORT_EXISTING_SUPERVISED_USER_TITLE },
- { "managedUserImportText", IDS_IMPORT_EXISTING_SUPERVISED_USER_TEXT },
+ { "supervisedUserImportTitle",
+ IDS_IMPORT_EXISTING_SUPERVISED_USER_TITLE },
+ { "supervisedUserImportText", IDS_IMPORT_EXISTING_SUPERVISED_USER_TEXT },
{ "createNewUserLink", IDS_CREATE_NEW_USER_LINK },
- { "managedUserImportOk", IDS_IMPORT_EXISTING_SUPERVISED_USER_OK },
- { "managedUserImportSigninError",
+ { "supervisedUserImportOk", IDS_IMPORT_EXISTING_SUPERVISED_USER_OK },
+ { "supervisedUserImportSigninError",
IDS_SUPERVISED_USER_IMPORT_SIGN_IN_ERROR },
- { "managedUserAlreadyOnThisDevice",
+ { "supervisedUserAlreadyOnThisDevice",
IDS_SUPERVISED_USER_ALREADY_ON_THIS_DEVICE },
- { "noExistingManagedUsers", IDS_SUPERVISED_USER_NO_EXISTING_ERROR },
- { "managedUserSelectAvatarTitle",
+ { "noExistingSupervisedUsers", IDS_SUPERVISED_USER_NO_EXISTING_ERROR },
+ { "supervisedUserSelectAvatarTitle",
IDS_SUPERVISED_USER_SELECT_AVATAR_TITLE },
- { "managedUserSelectAvatarText", IDS_SUPERVISED_USER_SELECT_AVATAR_TEXT },
- { "managedUserSelectAvatarOk", IDS_SUPERVISED_USER_SELECT_AVATAR_OK },
+ { "supervisedUserSelectAvatarText",
+ IDS_SUPERVISED_USER_SELECT_AVATAR_TEXT },
+ { "supervisedUserSelectAvatarOk", IDS_SUPERVISED_USER_SELECT_AVATAR_OK },
};
RegisterStrings(localized_strings, resources, arraysize(resources));
@@ -110,7 +112,7 @@ void SupervisedUserImportHandler::InitializeHandler() {
}
void SupervisedUserImportHandler::RegisterMessages() {
- web_ui()->RegisterMessageCallback("requestManagedUserImportUpdate",
+ web_ui()->RegisterMessageCallback("requestSupervisedUserImportUpdate",
base::Bind(&SupervisedUserImportHandler::
RequestSupervisedUserImportUpdate,
base::Unretained(this)));
@@ -121,7 +123,8 @@ void SupervisedUserImportHandler::OnSupervisedUsersChanged() {
}
void SupervisedUserImportHandler::FetchSupervisedUsers() {
- web_ui()->CallJavascriptFunction("options.ManagedUserListData.resetPromise");
+ web_ui()->CallJavascriptFunction(
+ "options.SupervisedUserListData.resetPromise");
RequestSupervisedUserImportUpdate(NULL);
}
@@ -205,12 +208,13 @@ void SupervisedUserImportHandler::SendExistingSupervisedUsers(
}
web_ui()->CallJavascriptFunction(
- "options.ManagedUserListData.receiveExistingManagedUsers",
+ "options.SupervisedUserListData.receiveExistingSupervisedUsers",
supervised_users);
}
void SupervisedUserImportHandler::ClearSupervisedUsersAndShowError() {
- web_ui()->CallJavascriptFunction("options.ManagedUserListData.onSigninError");
+ web_ui()->CallJavascriptFunction(
+ "options.SupervisedUserListData.onSigninError");
}
bool SupervisedUserImportHandler::IsAccountConnected() const {

Powered by Google App Engine
This is Rietveld 408576698