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

Unified Diff: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

Issue 11473019: [cros,rlz] Remove RLZ checkbox from OOBE UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add back old strings Created 8 years 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/resources/chromeos/login/oobe_screen_eula.js ('k') | chrome/common/pref_names.h » ('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 1f7a98f8c397a0cbb9225976a82a5b6322487816..6a9d1d91017c07ff8e996e33263c08037f0786e5 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -61,7 +61,7 @@ void EulaScreenHandler::GetLocalizedStrings(
localized_strings->SetString("acceptAgreement",
l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON));
localized_strings->SetString("eulaSystemInstallationSettings",
- l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_INSTALLATION_SETTINGS));
+ l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING));
localized_strings->SetString("eulaTpmDesc",
l10n_util::GetStringUTF16(IDS_EULA_TPM_DESCRIPTION));
localized_strings->SetString("eulaTpmKeyDesc",
@@ -121,7 +121,7 @@ void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
}
void EulaScreenHandler::HandleOnExit(const base::ListValue* args) {
- DCHECK(args->GetSize() == 3);
+ DCHECK(args->GetSize() == 2);
bool accepted = false;
if (!args->GetBoolean(0, &accepted))
@@ -131,14 +131,10 @@ void EulaScreenHandler::HandleOnExit(const base::ListValue* args) {
if (!args->GetBoolean(1, &usage_stats_enabled))
NOTREACHED();
- bool rlz_enabled = false;
- if (!args->GetBoolean(2, &rlz_enabled))
- NOTREACHED();
-
if (!delegate_)
return;
- delegate_->OnExit(accepted, usage_stats_enabled, rlz_enabled);
+ delegate_->OnExit(accepted, usage_stats_enabled);
}
void EulaScreenHandler::HandleOnLearnMore(const base::ListValue* args) {
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_eula.js ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698