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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #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"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.EulaScreen";
 
@@ skipping 41 matching lines @@
                             IDS_CREDITS_APP_DIALOG_HEIGHT_PIXELS));
   dialog->Show();
   // The dialog object will be deleted on dialog close.
 }
 
 }  // namespace
 
 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);
 }
 
 EulaScreenHandler::~EulaScreenHandler() {
   if (screen_)
     screen_->OnViewDestroyed(this);
 }
 
 void EulaScreenHandler::Show() {
   if (!page_is_ready()) {
@@ skipping 21 matching lines @@
 void EulaScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   builder->Add("eulaScreenTitle", IDS_EULA_SCREEN_TITLE);
   builder->Add("eulaScreenAccessibleTitle", IDS_EULA_SCREEN_ACCESSIBLE_TITLE);
   builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING);
   builder->Add("back", IDS_EULA_BACK_BUTTON);
   builder->Add("next", IDS_EULA_NEXT_BUTTON);
   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)
   builder->AddF("eulaRlzDesc",
                 IDS_EULA_RLZ_DESCRIPTION,
                 IDS_SHORT_PRODUCT_NAME,
                 IDS_PRODUCT_NAME);
   builder->AddF("eulaRlzEnable",
                 IDS_EULA_RLZ_ENABLE,
                 IDS_SHORT_PRODUCT_OS_NAME);
@@ skipping 70 matching lines @@
       GetNativeWindow(),
       IDS_ABOUT_VERSION_LICENSE_EULA,
       GURL(chrome::kChromeUICreditsURL));
 }
 
 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
   if (screen_)
     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