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

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

Issue 11412067: [rlz,cros] RLZ glue for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void EulaScreenHandler::GetLocalizedStrings( 53 void EulaScreenHandler::GetLocalizedStrings(
54 base::DictionaryValue* localized_strings) { 54 base::DictionaryValue* localized_strings) {
55 localized_strings->SetString("eulaScreenTitle", 55 localized_strings->SetString("eulaScreenTitle",
56 l10n_util::GetStringUTF16(IDS_EULA_SCREEN_TITLE)); 56 l10n_util::GetStringUTF16(IDS_EULA_SCREEN_TITLE));
57 localized_strings->SetString("checkboxLogging", 57 localized_strings->SetString("checkboxLogging",
58 l10n_util::GetStringUTF16(IDS_EULA_CHECKBOX_ENABLE_LOGGING)); 58 l10n_util::GetStringUTF16(IDS_EULA_CHECKBOX_ENABLE_LOGGING));
59 localized_strings->SetString("back", 59 localized_strings->SetString("back",
60 l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON)); 60 l10n_util::GetStringUTF16(IDS_EULA_BACK_BUTTON));
61 localized_strings->SetString("acceptAgreement", 61 localized_strings->SetString("acceptAgreement",
62 l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON)); 62 l10n_util::GetStringUTF16(IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON));
63 localized_strings->SetString("eulaSystemSecuritySetting", 63 localized_strings->SetString("eulaSystemInstallationSettings",
64 l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING)); 64 l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_INSTALLATION_SETTINGS));
65 localized_strings->SetString("eulaTpmDesc", 65 localized_strings->SetString("eulaTpmDesc",
66 l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION)); 66 l10n_util::GetStringUTF16(IDS_EULA_TPM_DESCRIPTION));
67 localized_strings->SetString("eulaTpmKeyDesc", 67 localized_strings->SetString("eulaTpmKeyDesc",
68 l10n_util::GetStringUTF16( 68 l10n_util::GetStringUTF16(IDS_EULA_TPM_KEY_DESCRIPTION));
69 IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION_KEY));
70 localized_strings->SetString("eulaTpmBusy", 69 localized_strings->SetString("eulaTpmBusy",
71 l10n_util::GetStringUTF16(IDS_EULA_TPM_BUSY)); 70 l10n_util::GetStringUTF16(IDS_EULA_TPM_BUSY));
72 localized_strings->SetString("eulaTpmOkButton", 71 #if defined(ENABLE_RLZ)
72 localized_strings->SetString("eulaRlzDesc",
73 l10n_util::GetStringFUTF16(IDS_EULA_RLZ_DESCRIPTION,
74 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME),
75 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
76 localized_strings->SetString("eulaRlzEnable",
77 l10n_util::GetStringFUTF16(IDS_EULA_RLZ_ENABLE,
78 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME)));
79 localized_strings->SetString("rlzEnabled", "enabled");
80 #else
81 localized_strings->SetString("rlzEnabled", "disabled");
82 #endif
83 localized_strings->SetString("eulaSystemInstallationSettingsOkButton",
73 l10n_util::GetStringUTF16(IDS_OK)); 84 l10n_util::GetStringUTF16(IDS_OK));
74 } 85 }
75 86
76 void EulaScreenHandler::Initialize() { 87 void EulaScreenHandler::Initialize() {
77 if (!page_is_ready() || !delegate_) 88 if (!page_is_ready() || !delegate_)
78 return; 89 return;
79 90
80 base::FundamentalValue checked(delegate_->IsUsageStatsEnabled()); 91 base::FundamentalValue checked(delegate_->IsUsageStatsEnabled());
81 web_ui()->CallJavascriptFunction("cr.ui.Oobe.setUsageStats", checked); 92 web_ui()->CallJavascriptFunction("cr.ui.Oobe.setUsageStats", checked);
82 93
83 // This OEM EULA is a file:// URL which we're unable to load in iframe. 94 // This OEM EULA is a file:// URL which we're unable to load in iframe.
84 // Instead if it's defined we use chrome://terms/oem that will load same file. 95 // Instead if it's defined we use chrome://terms/oem that will load same file.
85 if (!delegate_->GetOemEulaUrl().is_empty()) { 96 if (!delegate_->GetOemEulaUrl().is_empty()) {
86 StringValue oem_eula_url(chrome::kChromeUITermsOemURL); 97 StringValue oem_eula_url(chrome::kChromeUITermsOemURL);
87 web_ui()->CallJavascriptFunction("cr.ui.Oobe.setOemEulaUrl", oem_eula_url); 98 web_ui()->CallJavascriptFunction("cr.ui.Oobe.setOemEulaUrl", oem_eula_url);
88 } 99 }
89 100
90 if (show_on_init_) { 101 if (show_on_init_) {
91 Show(); 102 Show();
92 show_on_init_ = false; 103 show_on_init_ = false;
93 } 104 }
94 } 105 }
95 106
96 void EulaScreenHandler::RegisterMessages() { 107 void EulaScreenHandler::RegisterMessages() {
97 web_ui()->RegisterMessageCallback("eulaOnExit", 108 web_ui()->RegisterMessageCallback("eulaOnExit",
98 base::Bind(&EulaScreenHandler::HandleOnExit,base::Unretained(this))); 109 base::Bind(&EulaScreenHandler::HandleOnExit,base::Unretained(this)));
99 web_ui()->RegisterMessageCallback("eulaOnLearnMore", 110 web_ui()->RegisterMessageCallback("eulaOnLearnMore",
100 base::Bind(&EulaScreenHandler::HandleOnLearnMore,base::Unretained(this))); 111 base::Bind(&EulaScreenHandler::HandleOnLearnMore,base::Unretained(this)));
101 web_ui()->RegisterMessageCallback("eulaOnTpmPopupOpened", 112 web_ui()->RegisterMessageCallback("eulaOnInstallationSettingsPopupOpened",
102 base::Bind(&EulaScreenHandler::HandleOnTpmPopupOpened, 113 base::Bind(&EulaScreenHandler::HandleOnInstallationSettingsPopupOpened,
103 base::Unretained(this))); 114 base::Unretained(this)));
104 } 115 }
105 116
106 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) { 117 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
107 StringValue tpm_password_value(tpm_password); 118 StringValue tpm_password_value(tpm_password);
108 web_ui()->CallJavascriptFunction("cr.ui.Oobe.setTpmPassword", 119 web_ui()->CallJavascriptFunction("cr.ui.Oobe.setTpmPassword",
109 tpm_password_value); 120 tpm_password_value);
110 } 121 }
111 122
112 void EulaScreenHandler::HandleOnExit(const base::ListValue* args) { 123 void EulaScreenHandler::HandleOnExit(const base::ListValue* args) {
113 DCHECK(args->GetSize() == 2); 124 DCHECK(args->GetSize() == 3);
114 125
115 bool accepted = false; 126 bool accepted = false;
116 if (!args->GetBoolean(0, &accepted)) 127 if (!args->GetBoolean(0, &accepted))
117 NOTREACHED(); 128 NOTREACHED();
118 129
119 bool is_usage_stats_checked = false; 130 bool usage_stats_enabled = false;
120 if (!args->GetBoolean(1, &is_usage_stats_checked)) 131 if (!args->GetBoolean(1, &usage_stats_enabled))
132 NOTREACHED();
133
134 bool rlz_enabled = false;
135 if (!args->GetBoolean(2, &rlz_enabled))
121 NOTREACHED(); 136 NOTREACHED();
122 137
123 if (!delegate_) 138 if (!delegate_)
124 return; 139 return;
125 140
126 delegate_->OnExit(accepted, is_usage_stats_checked); 141 delegate_->OnExit(accepted, usage_stats_enabled, rlz_enabled);
127 } 142 }
128 143
129 void EulaScreenHandler::HandleOnLearnMore(const base::ListValue* args) { 144 void EulaScreenHandler::HandleOnLearnMore(const base::ListValue* args) {
130 if (!help_app_.get()) { 145 if (!help_app_.get()) {
131 help_app_ = new HelpAppLauncher(GetNativeWindow()); 146 help_app_ = new HelpAppLauncher(GetNativeWindow());
132 } 147 }
133 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE); 148 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
134 } 149 }
135 150
136 void EulaScreenHandler::HandleOnTpmPopupOpened(const base::ListValue* args) { 151 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened(
152 const base::ListValue* args) {
137 if (!delegate_) 153 if (!delegate_)
138 return; 154 return;
139 delegate_->InitiatePasswordFetch(); 155 delegate_->InitiatePasswordFetch();
140 } 156 }
141 157
142 } // namespace chromeos 158 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698