Rename "managed (mode|user)" to "supervised user" (part 9)

Followup to https://codereview.chromium.org/403343002/

This CL renames ChromeOS-specific resource IDs (strings/images)

Still missing:
- The global ENABLE_MANAGED_USERS define

TBRing a bunch of renames.
TBR=oshima@chromium.org (ash and c/b/ui/ash)
TBR=antrim@chromium.org (c/b/chromeos and ui/login)

BUG=385113

Review URL: https://codereview.chromium.org/425293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287534 0039d316-1c4b-4281-b951-d872f2087c98

ash/ash_strings.grd

@@ -352,7 +352,7 @@ Press Ctrl+Alt+Z to disable.
         Shut down
       </message>
 
-      <message name="IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL" desc="Label shown instead of email for supervised users">
+      <message name="IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL" desc="Label shown instead of email for supervised users">
          Supervised user
       </message>
 

ash/resources/ash_resources.grd

@@ -144,7 +144,7 @@
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP" file="cros/status/status_logout_button_pushed_top.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT" file="cros/status/status_logout_button_pushed_top_left.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT" file="cros/status/status_logout_button_pushed_top_right.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_USER" file="cros/status/status_managed_mode_user.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SUPERVISED_USER" file="cros/status/status_managed_mode_user.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="cros/network/status_network_info.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="cros/network/status_network_info_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICATION_3G" file="cros/network/notification_3g.png" />

ash/system/chromeos/supervised/tray_supervised_user.cc

@@ -51,7 +51,7 @@ views::View* TraySupervisedUser::CreateDefaultView(
   if (status != ash::user::LOGGED_IN_SUPERVISED)
     return NULL;
 
-  tray_view_ = new LabelTrayView(this, IDR_AURA_UBER_TRAY_MANAGED_USER);
+  tray_view_ = new LabelTrayView(this, IDR_AURA_UBER_TRAY_SUPERVISED_USER);
   UpdateMessage();
   return tray_view_;
 }
@@ -84,7 +84,7 @@ void TraySupervisedUser::CreateOrUpdateNotification(
           kNotificationId,
           base::string16() /* no title */,
           new_message,
-          bundle.GetImageNamed(IDR_AURA_UBER_TRAY_MANAGED_USER),
+          bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SUPERVISED_USER),
           system_notifier::kNotifierSupervisedUser,
           base::Closure() /* null callback */));
   message_center::MessageCenter::Get()->AddNotification(notification.Pass());

ash/system/user/tray_user.cc

@@ -174,7 +174,7 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 
   if (status == user::LOGGED_IN_SUPERVISED) {
     label_->SetText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL));
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
   } else if (status == user::LOGGED_IN_GUEST) {
     label_->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }

ash/system/user/user_card_view.cc

@@ -396,8 +396,7 @@ void UserCardView::AddUserContent(user::LoginStatus login_status,
       (multiprofile_index || !IsMultiAccountSupportedAndUserActive())) {
     base::string16 user_email_string =
         login_status == user::LOGGED_IN_SUPERVISED
-            ? l10n_util::GetStringUTF16(
-                  IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL)
+            ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(
                   delegate->GetUserInfo(multiprofile_index)->GetEmail());
     if (!user_email_string.empty()) {

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

@@ -157,11 +157,11 @@ void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() {
     return;
   actor_->ShowErrorPage(
       l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_TITLE),
+          IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE),
       l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE),
+          IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE),
       l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_INCONSISTENT_STATE_BUTTON));
+          IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_BUTTON));
 }
 
 void SupervisedUserCreationScreen::ShowInitialScreen() {
@@ -246,11 +246,11 @@ void SupervisedUserCreationScreen::ImportSupervisedUser(
   if (exists) {
     actor_->ShowErrorPage(
         l10n_util::GetStringUTF16(
-            IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE),
+            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE),
         l10n_util::GetStringUTF16(
-            IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR),
+            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR),
         l10n_util::GetStringUTF16(
-            IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON));
+            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON));
     return;
   }
 
@@ -306,11 +306,11 @@ void SupervisedUserCreationScreen::ImportSupervisedUserWithPassword(
   if (exists) {
     actor_->ShowErrorPage(
         l10n_util::GetStringUTF16(
-            IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE),
+            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE),
         l10n_util::GetStringUTF16(
-            IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR),
+            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR),
         l10n_util::GetStringUTF16(
-            IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON));
+            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON));
     return;
   }
 
@@ -358,7 +358,7 @@ void SupervisedUserCreationScreen::OnSupervisedUsersChanged() {
 void SupervisedUserCreationScreen::OnManagerCryptohomeAuthenticated() {
   if (actor_) {
     actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
-        IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_AUTH_PROGRESS_MESSAGE));
+        IDS_CREATE_SUPERVISED_USER_CREATION_AUTH_PROGRESS_MESSAGE));
   }
 }
 
@@ -380,20 +380,20 @@ void SupervisedUserCreationScreen::OnCreationError(
     case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT:
     case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM:
       title = l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_TITLE);
+          IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE);
       message = l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR);
+          IDS_CREATE_SUPERVISED_USER_TPM_ERROR);
       button = l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_BUTTON);
+          IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON);
       break;
     case SupervisedUserCreationController::CLOUD_SERVER_ERROR:
     case SupervisedUserCreationController::TOKEN_WRITE_FAILED:
       title = l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_TITLE);
+          IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE);
       message = l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR);
+          IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR);
       button = l10n_util::GetStringUTF16(
-          IDS_CREATE_LOCALLY_MANAGED_USER_GENERIC_ERROR_BUTTON);
+          IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON);
       break;
     case SupervisedUserCreationController::NO_ERROR:
       NOTREACHED();
@@ -405,7 +405,7 @@ void SupervisedUserCreationScreen::OnCreationError(
 void SupervisedUserCreationScreen::OnCreationTimeout() {
   if (actor_) {
     actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16(
-        IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_TIMEOUT_MESSAGE));
+        IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE));
   }
 }
 

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -388,7 +388,7 @@ const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage()
   if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
     return base::string16();
   return l10n_util::GetStringFUTF16(
-      IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
+      IDS_USER_IS_SUPERVISED_BY_NOTICE,
       base::UTF8ToUTF16(GetSupervisedUserManager()));
 }
 

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

@@ -58,11 +58,11 @@ void UpdateAuthParams(base::DictionaryValue* params, bool has_users,
   int message_id = -1;
   if (!has_users) {
     supervised_users_can_create = false;
-    message_id = IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT;
+    message_id = IDS_CREATE_SUPERVISED_USER_NO_MANAGER_TEXT;
   }
   if (!allow_new_user || !supervised_users_allowed) {
     supervised_users_can_create = false;
-    message_id = IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT;
+    message_id = IDS_CREATE_SUPERVISED_USER_CREATION_RESTRICTED_TEXT;
   }
 
   params->SetBoolean("supervisedUsersEnabled", supervised_users_allowed);
@@ -215,9 +215,9 @@ void GaiaScreenHandler::DeclareLocalizedValues(
   builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
   builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
   builder->Add("createSupervisedUser",
-               IDS_CREATE_LOCALLY_MANAGED_USER_HTML);
+               IDS_CREATE_SUPERVISED_USER_HTML);
   builder->Add("createSupervisedUserFeatureName",
-               IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME);
+               IDS_CREATE_SUPERVISED_USER_FEATURE_NAME);
   builder->Add("consumerManagementEnrollmentSigninMessage",
                IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT);
 

chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

@@ -50,77 +50,77 @@ void SupervisedUserCreationScreenHandler::DeclareLocalizedValues(
     LocalizedValuesBuilder* builder) {
   builder->Add(
       "supervisedUserCreationFlowRetryButtonTitle",
-      IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE);
+      IDS_CREATE_SUPERVISED_USER_CREATION_ERROR_RETRY_BUTTON_TITLE);
   builder->Add(
       "supervisedUserCreationFlowCancelButtonTitle",
-      IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_ERROR_CANCEL_BUTTON_TITLE);
+      IDS_CREATE_SUPERVISED_USER_CREATION_ERROR_CANCEL_BUTTON_TITLE);
   builder->Add(
       "supervisedUserCreationFlowGotitButtonTitle",
-       IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_GOT_IT_BUTTON_TITLE);
+       IDS_CREATE_SUPERVISED_USER_CREATION_GOT_IT_BUTTON_TITLE);
 
   builder->Add("createSupervisedUserIntroTextTitle",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE);
+               IDS_CREATE_SUPERVISED_INTRO_TEXT_TITLE);
   builder->Add("createSupervisedUserIntroAlternateText",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_ALTERNATE_TEXT);
+               IDS_CREATE_SUPERVISED_INTRO_ALTERNATE_TEXT);
   builder->Add("createSupervisedUserIntroText1",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1);
+               IDS_CREATE_SUPERVISED_INTRO_TEXT_1);
   builder->Add("createSupervisedUserIntroManagerItem1",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_1);
+               IDS_CREATE_SUPERVISED_INTRO_MANAGER_ITEM_1);
   builder->Add("createSupervisedUserIntroManagerItem2",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_2);
+               IDS_CREATE_SUPERVISED_INTRO_MANAGER_ITEM_2);
   builder->Add("createSupervisedUserIntroManagerItem3",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_MANAGER_ITEM_3);
+               IDS_CREATE_SUPERVISED_INTRO_MANAGER_ITEM_3);
   builder->Add("createSupervisedUserIntroText2",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2);
+               IDS_CREATE_SUPERVISED_INTRO_TEXT_2);
   builder->AddF("createSupervisedUserIntroText3",
-               IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3,
+               IDS_CREATE_SUPERVISED_INTRO_TEXT_3,
                base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
 
   builder->Add("createSupervisedUserPickManagerTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PICK_MANAGER_TITLE);
   builder->AddF("createSupervisedUserPickManagerTitleExplanation",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION,
+               IDS_CREATE_SUPERVISED_USER_CREATE_PICK_MANAGER_EXPLANATION,
                base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
   builder->Add("createSupervisedUserManagerPasswordHint",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_MANAGER_PASSWORD_HINT);
   builder->Add("createSupervisedUserWrongManagerPasswordText",
-               IDS_CREATE_LOCALLY_MANAGED_USER_MANAGER_PASSWORD_ERROR);
+               IDS_CREATE_SUPERVISED_USER_MANAGER_PASSWORD_ERROR);
 
   builder->Add("createSupervisedUserNameTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_TITLE);
+               IDS_CREATE_SUPERVISED_USER_CREATE_ACCOUNT_NAME_TITLE);
   builder->Add("createSupervisedUserNameAccessibleTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_SETUP_ACCESSIBLE_TITLE);
+               IDS_CREATE_SUPERVISED_USER_SETUP_ACCESSIBLE_TITLE);
   builder->Add("createSupervisedUserNameExplanation",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_EXPLANATION);
+               IDS_CREATE_SUPERVISED_USER_CREATE_ACCOUNT_NAME_EXPLANATION);
   builder->Add("createSupervisedUserNameHint",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ACCOUNT_NAME_HINT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_ACCOUNT_NAME_HINT);
   builder->Add("createSupervisedUserPasswordTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TITLE);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PASSWORD_TITLE);
   builder->Add("createSupervisedUserPasswordExplanation",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_EXPLANATION);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PASSWORD_EXPLANATION);
   builder->Add("createSupervisedUserPasswordHint",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_HINT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PASSWORD_HINT);
   builder->Add("createSupervisedUserPasswordConfirmHint",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_CONFIRM_HINT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PASSWORD_CONFIRM_HINT);
   builder->Add("supervisedUserCreationFlowProceedButtonTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_CONTINUE_BUTTON_TEXT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_CONTINUE_BUTTON_TEXT);
   builder->Add("supervisedUserCreationFlowStartButtonTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_START_BUTTON_TEXT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_START_BUTTON_TEXT);
   builder->Add("supervisedUserCreationFlowPrevButtonTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PREVIOUS_BUTTON_TEXT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PREVIOUS_BUTTON_TEXT);
   builder->Add("supervisedUserCreationFlowNextButtonTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_NEXT_BUTTON_TEXT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_NEXT_BUTTON_TEXT);
   builder->Add("supervisedUserCreationFlowHandleErrorButtonTitle",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_HANDLE_ERROR_BUTTON_TEXT);
+               IDS_CREATE_SUPERVISED_USER_CREATE_HANDLE_ERROR_BUTTON_TEXT);
   builder->Add("createSupervisedUserPasswordMismatchError",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR);
+               IDS_CREATE_SUPERVISED_USER_CREATE_PASSWORD_MISMATCH_ERROR);
 
   builder->Add("createSupervisedUserCreatedText1",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_1);
+               IDS_CREATE_SUPERVISED_USER_CREATED_1_TEXT_1);
   builder->Add("createSupervisedUserCreatedText2",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_2);
+               IDS_CREATE_SUPERVISED_USER_CREATED_1_TEXT_2);
   builder->Add("createSupervisedUserCreatedText3",
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_3);
+               IDS_CREATE_SUPERVISED_USER_CREATED_1_TEXT_3);
 
   builder->Add("importExistingSupervisedUserTitle",
                IDS_IMPORT_EXISTING_SUPERVISED_USER_TITLE);
@@ -304,11 +304,11 @@ void SupervisedUserCreationScreenHandler::HandleCheckSupervisedUserName(
           FindByDisplayName(base::CollapseWhitespace(name, true))) {
     CallJS("supervisedUserNameError", name,
            l10n_util::GetStringUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS));
+               IDS_CREATE_SUPERVISED_USER_CREATE_USERNAME_ALREADY_EXISTS));
   } else if (net::EscapeForHTML(name) != name) {
     CallJS("supervisedUserNameError", name,
            l10n_util::GetStringUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ILLEGAL_USERNAME));
+               IDS_CREATE_SUPERVISED_USER_CREATE_ILLEGAL_USERNAME));
   } else if (delegate_ && delegate_->FindUserByDisplayName(
                  base::CollapseWhitespace(name, true), &user_id)) {
     CallJS("supervisedUserSuggestImport", name, user_id);
@@ -328,26 +328,26 @@ void SupervisedUserCreationScreenHandler::HandleCreateSupervisedUser(
           FindByDisplayName(new_user_name)) {
     CallJS("supervisedUserNameError", new_user_name,
            l10n_util::GetStringFUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS,
+               IDS_CREATE_SUPERVISED_USER_CREATE_USERNAME_ALREADY_EXISTS,
                new_user_name));
     return;
   }
   if (net::EscapeForHTML(new_user_name) != new_user_name) {
     CallJS("supervisedUserNameError", new_user_name,
            l10n_util::GetStringUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_ILLEGAL_USERNAME));
+               IDS_CREATE_SUPERVISED_USER_CREATE_ILLEGAL_USERNAME));
     return;
   }
 
   if (new_user_password.length() == 0) {
     CallJS("showPasswordError",
            l10n_util::GetStringUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT));
+               IDS_CREATE_SUPERVISED_USER_CREATE_PASSWORD_TOO_SHORT));
     return;
   }
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
-      IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
+      IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
   delegate_->CreateSupervisedUser(new_user_name, new_user_password);
 }
@@ -358,7 +358,7 @@ void SupervisedUserCreationScreenHandler::HandleImportSupervisedUser(
     return;
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
-      IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
+      IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
   delegate_->ImportSupervisedUser(user_id);
 }
@@ -371,7 +371,7 @@ void SupervisedUserCreationScreenHandler::
     return;
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
-      IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
+      IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
   delegate_->ImportSupervisedUserWithPassword(user_id, password);
 }

chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

@@ -38,10 +38,6 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
 
-#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/supervised_user/supervised_user_service.h"
-#endif
-
 namespace {
 // User dictionary keys.
 const char kKeyUsername[] = "username";

ui/login/display_manager.js

@@ -21,7 +21,7 @@
 /** @const */ var SCREEN_ERROR_MESSAGE = 'error-message';
 /** @const */ var SCREEN_TPM_ERROR = 'tpm-error-message';
 /** @const */ var SCREEN_PASSWORD_CHANGED = 'password-changed';
-/** @const */ var SCREEN_CREATE_MANAGED_USER_FLOW =
+/** @const */ var SCREEN_CREATE_SUPERVISED_USER_FLOW =
     'supervised-user-creation';
 /** @const */ var SCREEN_APP_LAUNCH_SPLASH = 'app-launch-splash';
 /** @const */ var SCREEN_CONFIRM_PASSWORD = 'confirm-password';