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

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 425293002: Rename "managed (mode|user)" to "supervised user" (part 9) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
index fb6e18a7976f8124aeeef78540464ae144e9eec5..2ce7d945d2ec1662c9d1cc11b8fd7dd77baa1102 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/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));
}
}
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698