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

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

Issue 2247723002: ChromeOS: Implement EULA screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_welcome.js ('k') | ui/login/screen_container.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 IDS_EULA_RLZ_DESCRIPTION, 139 IDS_EULA_RLZ_DESCRIPTION,
140 IDS_SHORT_PRODUCT_NAME, 140 IDS_SHORT_PRODUCT_NAME,
141 IDS_PRODUCT_NAME); 141 IDS_PRODUCT_NAME);
142 builder->AddF("eulaRlzEnable", 142 builder->AddF("eulaRlzEnable",
143 IDS_EULA_RLZ_ENABLE, 143 IDS_EULA_RLZ_ENABLE,
144 IDS_SHORT_PRODUCT_OS_NAME); 144 IDS_SHORT_PRODUCT_OS_NAME);
145 #endif 145 #endif
146 146
147 builder->Add("chromeCreditsLink", IDS_ABOUT_VERSION_LICENSE_EULA); 147 builder->Add("chromeCreditsLink", IDS_ABOUT_VERSION_LICENSE_EULA);
148 builder->Add("chromeosCreditsLink", IDS_ABOUT_CROS_VERSION_LICENSE_EULA); 148 builder->Add("chromeosCreditsLink", IDS_ABOUT_CROS_VERSION_LICENSE_EULA);
149
150 /* MD-OOBE */
151 builder->Add("oobeEulaSectionTitle", IDS_OOBE_EULA_SECTION_TITLE);
152 builder->Add("oobeEulaAcceptAndContinueButtonText",
153 IDS_OOBE_EULA_ACCEPT_AND_CONTINUE_BUTTON_TEXT);
149 } 154 }
150 155
151 void EulaScreenHandler::DeclareJSCallbacks() { 156 void EulaScreenHandler::DeclareJSCallbacks() {
152 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore); 157 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
153 AddCallback("eulaOnChromeOSCredits", 158 AddCallback("eulaOnChromeOSCredits",
154 &EulaScreenHandler::HandleOnChromeOSCredits); 159 &EulaScreenHandler::HandleOnChromeOSCredits);
155 AddCallback("eulaOnChromeCredits", &EulaScreenHandler::HandleOnChromeCredits); 160 AddCallback("eulaOnChromeCredits", &EulaScreenHandler::HandleOnChromeCredits);
156 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore); 161 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
157 AddCallback("eulaOnInstallationSettingsPopupOpened", 162 AddCallback("eulaOnInstallationSettingsPopupOpened",
158 &EulaScreenHandler::HandleOnInstallationSettingsPopupOpened); 163 &EulaScreenHandler::HandleOnInstallationSettingsPopupOpened);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 IDS_ABOUT_VERSION_LICENSE_EULA, 215 IDS_ABOUT_VERSION_LICENSE_EULA,
211 GURL(chrome::kChromeUICreditsURL)); 216 GURL(chrome::kChromeUICreditsURL));
212 } 217 }
213 218
214 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() { 219 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
215 if (model_) 220 if (model_)
216 model_->InitiatePasswordFetch(); 221 model_->InitiatePasswordFetch();
217 } 222 }
218 223
219 } // namespace chromeos 224 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_welcome.js ('k') | ui/login/screen_container.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698