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

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: 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h ('k') | components/login/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f8dfee03f221a2b5d3410742dd802e85f10368b5 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -83,7 +83,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 +127,15 @@ 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);
+
+ 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);
+ ::login::GetSecureModuleUsed(base::Bind(
+ &EulaScreenHandler::UpdateLocalizedValues, weak_factory_.GetWeakPtr()));
+
builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK);
builder->Add("termsOfServiceLoading", IDS_TERMS_OF_SERVICE_SCREEN_LOADING);
#if BUILDFLAG(ENABLE_RLZ)
@@ -219,4 +226,19 @@ void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
screen_->InitiatePasswordFetch();
}
+void EulaScreenHandler::UpdateLocalizedValues(
+ ::login::SecureModuleUsed secure_module_used) {
+ base::DictionaryValue updated_secure_module_strings;
+ auto builder = base::MakeUnique<::login::LocalizedValuesBuilder>(
+ &updated_secure_module_strings);
+ if (secure_module_used == ::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);
+ core_oobe_view_->ReloadEulaContent(updated_secure_module_strings);
+ }
+}
+
} // namespace chromeos
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h ('k') | components/login/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698