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

Unified Diff: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.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
Index: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
index fd7e40d78919f8a43695e3930c7827d762e0c736..14f91d4268ace52a7381db150296259efe56d593 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -20,6 +20,7 @@
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/locale_settings.h"
+#include "chromeos/tpm/tpm_token_info_getter.h"
#include "components/login/localized_values_builder.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/web_contents.h"
@@ -125,10 +126,21 @@ void EulaScreenHandler::DeclareLocalizedValues(
builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON);
builder->Add("eulaSystemInstallationSettings",
IDS_EULA_SYSTEM_SECURITY_SETTING);
- builder->Add("eulaTpmDesc", IDS_EULA_TPM_DESCRIPTION);
- builder->Add("eulaTpmKeyDesc", IDS_EULA_TPM_KEY_DESCRIPTION);
- builder->Add("eulaTpmDescPowerwash", IDS_EULA_TPM_KEY_DESCRIPTION_POWERWASH);
- builder->Add("eulaTpmBusy", IDS_EULA_TPM_BUSY);
+
+ if (TPMTokenInfoGetter::DoesTPMExist()) {
+ builder->Add("eulaTpmDesc", IDS_EULA_TPM_DESCRIPTION);
+ builder->Add("eulaTpmKeyDesc", IDS_EULA_TPM_KEY_DESCRIPTION);
+ builder->Add("eulaTpmDescPowerwash",
+ IDS_EULA_TPM_KEY_DESCRIPTION_POWERWASH);
+ builder->Add("eulaTpmBusy", IDS_EULA_TPM_BUSY);
+ } else {
+ builder->Add("eulaTpmDesc", IDS_EULA_SECURE_MODULE_DESCRIPTION);
+ builder->Add("eulaTpmKeyDesc", IDS_EULA_SECURE_MODULE_KEY_DESCRIPTION);
+ builder->Add("eulaTpmDescPowerwash",
+ IDS_EULA_SECURE_MODULE_KEY_DESCRIPTION_POWERWASH);
+ builder->Add("eulaTpmBusy", IDS_EULA_SECURE_MODULE_BUSY);
+ }
+
builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK);
builder->Add("termsOfServiceLoading", IDS_TERMS_OF_SERVICE_SCREEN_LOADING);
#if BUILDFLAG(ENABLE_RLZ)

Powered by Google App Engine
This is Rietveld 408576698