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

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

Issue 2688153004: ChromeOS OOBE: fix focus flow in MD-OOBE. (Closed)
Patch Set: Rebased. Created 3 years, 10 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_dialog.js ('k') | no next file » | 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 builder->AddF("eulaRlzEnable", 139 builder->AddF("eulaRlzEnable",
140 IDS_EULA_RLZ_ENABLE, 140 IDS_EULA_RLZ_ENABLE,
141 IDS_SHORT_PRODUCT_OS_NAME); 141 IDS_SHORT_PRODUCT_OS_NAME);
142 #endif 142 #endif
143 143
144 builder->Add("chromeCreditsLink", IDS_ABOUT_VERSION_LICENSE_EULA); 144 builder->Add("chromeCreditsLink", IDS_ABOUT_VERSION_LICENSE_EULA);
145 builder->Add("chromeosCreditsLink", IDS_ABOUT_CROS_VERSION_LICENSE_EULA); 145 builder->Add("chromeosCreditsLink", IDS_ABOUT_CROS_VERSION_LICENSE_EULA);
146 146
147 /* MD-OOBE */ 147 /* MD-OOBE */
148 builder->Add("oobeEulaSectionTitle", IDS_OOBE_EULA_SECTION_TITLE); 148 builder->Add("oobeEulaSectionTitle", IDS_OOBE_EULA_SECTION_TITLE);
149 builder->Add("oobeEulaIframeLabel", IDS_OOBE_EULA_IFRAME_LABEL);
149 builder->Add("oobeEulaAcceptAndContinueButtonText", 150 builder->Add("oobeEulaAcceptAndContinueButtonText",
150 IDS_OOBE_EULA_ACCEPT_AND_CONTINUE_BUTTON_TEXT); 151 IDS_OOBE_EULA_ACCEPT_AND_CONTINUE_BUTTON_TEXT);
151 } 152 }
152 153
153 void EulaScreenHandler::DeclareJSCallbacks() { 154 void EulaScreenHandler::DeclareJSCallbacks() {
154 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore); 155 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
155 AddCallback("eulaOnChromeOSCredits", 156 AddCallback("eulaOnChromeOSCredits",
156 &EulaScreenHandler::HandleOnChromeOSCredits); 157 &EulaScreenHandler::HandleOnChromeOSCredits);
157 AddCallback("eulaOnChromeCredits", &EulaScreenHandler::HandleOnChromeCredits); 158 AddCallback("eulaOnChromeCredits", &EulaScreenHandler::HandleOnChromeCredits);
158 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore); 159 AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 IDS_ABOUT_VERSION_LICENSE_EULA, 213 IDS_ABOUT_VERSION_LICENSE_EULA,
213 GURL(chrome::kChromeUICreditsURL)); 214 GURL(chrome::kChromeUICreditsURL));
214 } 215 }
215 216
216 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() { 217 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
217 if (screen_) 218 if (screen_)
218 screen_->InitiatePasswordFetch(); 219 screen_->InitiatePasswordFetch();
219 } 220 }
220 221
221 } // namespace chromeos 222 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_welcome_dialog.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698