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

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

Issue 2856683002: cros: Replace "TPM" with "secure module" for machines without TPM. (Closed)
Patch Set: Suffixed chromeos for chromeos compiling of secure_module_*. Created 3 years, 7 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/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 f2ed96360680139397c09c720dc499ad04d2ba73..b3bffd482dd5478f9f3a6a4d0f361a77b6a831cb 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
@@ -410,13 +410,10 @@ void SupervisedUserCreationScreen::OnCreationError(
case SupervisedUserCreationController::CRYPTOHOME_NO_MOUNT:
case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT:
case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM:
- title = l10n_util::GetStringUTF16(
- IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE);
- message = l10n_util::GetStringUTF16(
- IDS_CREATE_SUPERVISED_USER_TPM_ERROR);
- button = l10n_util::GetStringUTF16(
- IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON);
- break;
+ ::login::GetSecureModuleUsed(
+ base::Bind(&SupervisedUserCreationScreen::UpdateSecureModuleMessages,
+ weak_factory_.GetWeakPtr()));
+ return;
case SupervisedUserCreationController::CLOUD_SERVER_ERROR:
case SupervisedUserCreationController::TOKEN_WRITE_FAILED:
title = l10n_util::GetStringUTF16(
@@ -587,6 +584,36 @@ void SupervisedUserCreationScreen::OnGetSupervisedUsers(
view_->ShowExistingSupervisedUsers(ui_users.get());
}
+void SupervisedUserCreationScreen::UpdateSecureModuleMessages(
+ ::login::SecureModuleUsed secure_module_used) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ base::string16 title;
+ base::string16 message;
+ base::string16 button;
+ switch (secure_module_used) {
+ case ::login::SecureModuleUsed::TPM:
+ title =
+ l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE);
+ message = l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_TPM_ERROR);
+ button = l10n_util::GetStringUTF16(
+ IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON);
+ break;
+ case ::login::SecureModuleUsed::CR50:
+ title = l10n_util::GetStringUTF16(
+ IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR_TITLE);
+ message = l10n_util::GetStringUTF16(
+ IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR);
+ button = l10n_util::GetStringUTF16(
+ IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR_BUTTON);
+ break;
+ default:
+ NOTREACHED();
+ break;
+ }
+ if (view_)
+ view_->ShowErrorPage(title, message, button);
+}
+
void SupervisedUserCreationScreen::OnPhotoTaken(
const std::string& raw_data) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

Powered by Google App Engine
This is Rietveld 408576698