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

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

Issue 209143002: Added shortcut for NW config screen in kiosk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc ('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/error_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 &ErrorScreenHandler::HandleConfigureCerts); 215 &ErrorScreenHandler::HandleConfigureCerts);
216 AddCallback("launchOobeGuestSession", 216 AddCallback("launchOobeGuestSession",
217 &ErrorScreenHandler::HandleLaunchOobeGuestSession); 217 &ErrorScreenHandler::HandleLaunchOobeGuestSession);
218 } 218 }
219 219
220 void ErrorScreenHandler::DeclareLocalizedValues( 220 void ErrorScreenHandler::DeclareLocalizedValues(
221 LocalizedValuesBuilder* builder) { 221 LocalizedValuesBuilder* builder) {
222 builder->Add("loginErrorTitle", IDS_LOGIN_ERROR_TITLE); 222 builder->Add("loginErrorTitle", IDS_LOGIN_ERROR_TITLE);
223 builder->Add("signinOfflineMessageBody", IDS_LOGIN_OFFLINE_MESSAGE); 223 builder->Add("signinOfflineMessageBody", IDS_LOGIN_OFFLINE_MESSAGE);
224 builder->Add("kioskOfflineMessageBody", IDS_KIOSK_OFFLINE_MESSAGE); 224 builder->Add("kioskOfflineMessageBody", IDS_KIOSK_OFFLINE_MESSAGE);
225 builder->Add("kioskOnlineTitle", IDS_LOGIN_NETWORK_RESTORED_TITLE);
226 builder->Add("kioskOnlineMessageBody", IDS_KIOSK_ONLINE_MESSAGE);
225 builder->Add("autoEnrollmentOfflineMessageBody", 227 builder->Add("autoEnrollmentOfflineMessageBody",
226 IDS_LOGIN_AUTO_ENROLLMENT_OFFLINE_MESSAGE); 228 IDS_LOGIN_AUTO_ENROLLMENT_OFFLINE_MESSAGE);
227 builder->Add("captivePortalTitle", IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_TITLE); 229 builder->Add("captivePortalTitle", IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_TITLE);
228 builder->Add("captivePortalMessage", IDS_LOGIN_MAYBE_CAPTIVE_PORTAL); 230 builder->Add("captivePortalMessage", IDS_LOGIN_MAYBE_CAPTIVE_PORTAL);
229 builder->Add("captivePortalProxyMessage", 231 builder->Add("captivePortalProxyMessage",
230 IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY); 232 IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY);
231 builder->Add("captivePortalNetworkSelect", 233 builder->Add("captivePortalNetworkSelect",
232 IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT); 234 IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT);
233 builder->Add("signinProxyMessageText", IDS_LOGIN_PROXY_ERROR_MESSAGE); 235 builder->Add("signinProxyMessageText", IDS_LOGIN_PROXY_ERROR_MESSAGE);
234 builder->Add("updateOfflineMessageBody", IDS_UPDATE_OFFLINE_MESSAGE); 236 builder->Add("updateOfflineMessageBody", IDS_UPDATE_OFFLINE_MESSAGE);
235 builder->Add("updateProxyMessageText", IDS_UPDATE_PROXY_ERROR_MESSAGE); 237 builder->Add("updateProxyMessageText", IDS_UPDATE_PROXY_ERROR_MESSAGE);
236 builder->AddF("localStateErrorText0", IDS_LOCAL_STATE_ERROR_TEXT_0, 238 builder->AddF("localStateErrorText0", IDS_LOCAL_STATE_ERROR_TEXT_0,
237 IDS_SHORT_PRODUCT_NAME); 239 IDS_SHORT_PRODUCT_NAME);
238 builder->Add("localStateErrorText1", IDS_LOCAL_STATE_ERROR_TEXT_1); 240 builder->Add("localStateErrorText1", IDS_LOCAL_STATE_ERROR_TEXT_1);
239 builder->Add("localStateErrorPowerwashButton", 241 builder->Add("localStateErrorPowerwashButton",
240 IDS_LOCAL_STATE_ERROR_POWERWASH_BUTTON); 242 IDS_LOCAL_STATE_ERROR_POWERWASH_BUTTON);
241 builder->Add("connectingIndicatorText", IDS_LOGIN_CONNECTING_INDICATOR_TEXT); 243 builder->Add("connectingIndicatorText", IDS_LOGIN_CONNECTING_INDICATOR_TEXT);
242 builder->Add("guestSigninFixNetwork", IDS_LOGIN_GUEST_SIGNIN_FIX_NETWORK); 244 builder->Add("guestSigninFixNetwork", IDS_LOGIN_GUEST_SIGNIN_FIX_NETWORK);
243 builder->Add("rebootButton", IDS_RELAUNCH_BUTTON); 245 builder->Add("rebootButton", IDS_RELAUNCH_BUTTON);
244 builder->Add("diagnoseButton", IDS_DIAGNOSE_BUTTON); 246 builder->Add("diagnoseButton", IDS_DIAGNOSE_BUTTON);
245 builder->Add("configureCertsButton", IDS_MANAGE_CERTIFICATES); 247 builder->Add("configureCertsButton", IDS_MANAGE_CERTIFICATES);
248 builder->Add("continueButton", IDS_NETWORK_SELECTION_CONTINUE_BUTTON);
246 } 249 }
247 250
248 void ErrorScreenHandler::Initialize() { 251 void ErrorScreenHandler::Initialize() {
249 if (!page_is_ready()) 252 if (!page_is_ready())
250 return; 253 return;
251 if (show_on_init_) { 254 if (show_on_init_) {
252 base::DictionaryValue params; 255 base::DictionaryValue params;
253 params.SetInteger("uiState", static_cast<int>(ui_state_)); 256 params.SetInteger("uiState", static_cast<int>(ui_state_));
254 params.SetInteger("errorState", static_cast<int>(error_state_)); 257 params.SetInteger("errorState", static_cast<int>(error_state_));
255 params.SetString("network", network_); 258 params.SetString("network", network_);
256 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); 259 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_);
257 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); 260 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_);
258 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); 261 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_);
259 Show(parent_screen_, &params); 262 Show(parent_screen_, &params);
260 show_on_init_ = false; 263 show_on_init_ = false;
261 } 264 }
262 } 265 }
263 266
264 } // namespace chromeos 267 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698