[rlz,cros] RLZ glue for ChromeOS.

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 d59997a29ebf4a7766f9d31455af3d6036d7169a..1f7a98f8c397a0cbb9225976a82a5b6322487816 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -60,16 +60,27 @@ void EulaScreenHandler::GetLocalizedStrings(
       l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON));
   localized_strings->SetString("acceptAgreement",
       l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON));
-  localized_strings->SetString("eulaSystemSecuritySetting",
-      l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING));
+  localized_strings->SetString("eulaSystemInstallationSettings",
+      l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_INSTALLATION_SETTINGS));
   localized_strings->SetString("eulaTpmDesc",
-      l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION));
+      l10n_util::GetStringUTF16(IDS_EULA_TPM_DESCRIPTION));
   localized_strings->SetString("eulaTpmKeyDesc",
-      l10n_util::GetStringUTF16(
-          IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION_KEY));
+      l10n_util::GetStringUTF16(IDS_EULA_TPM_KEY_DESCRIPTION));
   localized_strings->SetString("eulaTpmBusy",
       l10n_util::GetStringUTF16(IDS_EULA_TPM_BUSY));
-  localized_strings->SetString("eulaTpmOkButton",
+#if defined(ENABLE_RLZ)
+  localized_strings->SetString("eulaRlzDesc",
+      l10n_util::GetStringFUTF16(IDS_EULA_RLZ_DESCRIPTION,
+          l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME),
+          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  localized_strings->SetString("eulaRlzEnable",
+      l10n_util::GetStringFUTF16(IDS_EULA_RLZ_ENABLE,
+          l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME)));
+  localized_strings->SetString("rlzEnabled", "enabled");
+#else
+  localized_strings->SetString("rlzEnabled", "disabled");
+#endif
+  localized_strings->SetString("eulaSystemInstallationSettingsOkButton",
       l10n_util::GetStringUTF16(IDS_OK));
 }
 
@@ -98,8 +109,8 @@ void EulaScreenHandler::RegisterMessages() {
       base::Bind(&EulaScreenHandler::HandleOnExit,base::Unretained(this)));
   web_ui()->RegisterMessageCallback("eulaOnLearnMore",
       base::Bind(&EulaScreenHandler::HandleOnLearnMore,base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("eulaOnTpmPopupOpened",
-      base::Bind(&EulaScreenHandler::HandleOnTpmPopupOpened,
+  web_ui()->RegisterMessageCallback("eulaOnInstallationSettingsPopupOpened",
+      base::Bind(&EulaScreenHandler::HandleOnInstallationSettingsPopupOpened,
                  base::Unretained(this)));
 }
 
@@ -110,20 +121,24 @@ void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
 }
 
 void EulaScreenHandler::HandleOnExit(const base::ListValue* args) {
-  DCHECK(args->GetSize() == 2);
+  DCHECK(args->GetSize() == 3);
 
   bool accepted = false;
   if (!args->GetBoolean(0, &accepted))
     NOTREACHED();
 
-  bool is_usage_stats_checked = false;
-  if (!args->GetBoolean(1, &is_usage_stats_checked))
+  bool usage_stats_enabled = false;
+  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, is_usage_stats_checked);
+  delegate_->OnExit(accepted, usage_stats_enabled, rlz_enabled);
 }
 
 void EulaScreenHandler::HandleOnLearnMore(const base::ListValue* args) {
@@ -133,7 +148,8 @@ void EulaScreenHandler::HandleOnLearnMore(const base::ListValue* args) {
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
 }
 
-void EulaScreenHandler::HandleOnTpmPopupOpened(const base::ListValue* args) {
+void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened(
+    const base::ListValue* args) {
   if (!delegate_)
     return;
   delegate_->InitiatePasswordFetch();