cros: Replace "TPM" with "secure module" for machines without TPM.

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

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..9a198e801aaf9bb2969ca9879a83bea7c44be2b9 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -21,7 +21,9 @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/login/localized_values_builder.h"
+#include "components/login/secure_module_util.h"
 #include "components/strings/grit/components_strings.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "rlz/features/features.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -83,7 +85,9 @@ void ShowCreditsDialog(Profile* profile,
 namespace chromeos {
 
 EulaScreenHandler::EulaScreenHandler(CoreOobeView* core_oobe_view)
-    : BaseScreenHandler(kScreenId), core_oobe_view_(core_oobe_view) {
+    : BaseScreenHandler(kScreenId),
+      core_oobe_view_(core_oobe_view),
+      weak_factory_(this) {
   set_call_js_prefix(kJsScreenPath);
 }
 
@@ -125,10 +129,33 @@ 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);
+
+  switch (::login::GetSecureModuleUsed()) {
+    case ::login::SecureModuleUsed::CR50:
+    case ::login::SecureModuleUsed::UNQUERIED:
+      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);
+      if (::login::GetSecureModuleUsed() ==
+          ::login::SecureModuleUsed::UNQUERIED) {
+        content::BrowserThread::PostTaskAndReply(
+            content::BrowserThread::IO, FROM_HERE,
+            base::BindOnce(&::login::QuerySecureModuleUsed),
+            base::BindOnce(&EulaScreenHandler::UpdateLocalizedValues,
+                           weak_factory_.GetWeakPtr()));
+      }
+      break;
+    case ::login::SecureModuleUsed::TPM:
+      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);
+      break;
+  }
+
   builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK);
   builder->Add("termsOfServiceLoading", IDS_TERMS_OF_SERVICE_SCREEN_LOADING);
 #if BUILDFLAG(ENABLE_RLZ)
@@ -219,4 +246,8 @@ void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
     screen_->InitiatePasswordFetch();
 }
 
+void EulaScreenHandler::UpdateLocalizedValues() {
+  GetOobeUI()->UpdateLocalizedStringsIfNeeded();

[sammiequon, 2017/05/04 16:04:47]

Is there a better approach than updating everything again?

[xiyuan, 2017/05/04 18:26:35]

UpdateLocalizedStringsIfNeeded() only reloads when md mode is changed. So it is
probably a no-op here.  Also it might cause UI to flicker. How about adding an
explicit JS call something similar to the current reloadContent impl but on JS
side, only do
      loadTimeData.overrideValues(data);
      i18nTemplate.process(document, loadTimeData);

https://cs.chromium.org/chromium/src/chrome/browser/resources/chromeos/login/...

[sammiequon, 2017/05/04 22:30:41]

Attempted.

+}
+
 }  // namespace chromeos