chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 2856683002: cros: Replace "TPM" with "secure module" for machines without TPM.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Created 3 years, 8 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

« chrome/app/chromeos_strings.grdp ('K') | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc » ('j') | chromeos/tpm/tpm_token_info_getter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 f2ed96360680139397c09c720dc499ad04d2ba73..afc729a028f0271657f49f1e03425b7e9b64dd84 100644

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

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

@@ -38,6 +38,7 @@

#include "chromeos/login/auth/key.h"

#include "chromeos/login/auth/user_context.h"

#include "chromeos/network/network_state.h"

+#include "chromeos/tpm/tpm_token_info_getter.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_image/user_image.h"

#include "content/public/browser/browser_thread.h"

@@ -410,12 +411,21 @@ 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);

+ if (TPMTokenInfoGetter::DoesTPMExist()) {

+ 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);

+ } else {

+ 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;

case SupervisedUserCreationController::CLOUD_SERVER_ERROR:

case SupervisedUserCreationController::TOKEN_WRITE_FAILED: