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

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

Issue 252503002: Base version of HID detection OOBE screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unused variabled removed. Created 6 years, 7 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/oobe_ui.h ('k') | chromeos/chromeos_switches.h » ('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/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) { 125 path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) {
126 LOG(ERROR) << "Unknown display type '" << path << "'. Setting default."; 126 LOG(ERROR) << "Unknown display type '" << path << "'. Setting default.";
127 return kLoginDisplay; 127 return kLoginDisplay;
128 } 128 }
129 return path; 129 return path;
130 } 130 }
131 131
132 } // namespace 132 } // namespace
133 133
134 // static 134 // static
135 const char OobeUI::kScreenOobeNetwork[] = "connect"; 135 const char OobeUI::kScreenOobeHIDDetection[] = "hid-detection";
136 const char OobeUI::kScreenOobeEula[] = "eula"; 136 const char OobeUI::kScreenOobeNetwork[] = "connect";
137 const char OobeUI::kScreenOobeUpdate[] = "update"; 137 const char OobeUI::kScreenOobeEula[] = "eula";
138 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment"; 138 const char OobeUI::kScreenOobeUpdate[] = "update";
139 const char OobeUI::kScreenOobeReset[] = "reset"; 139 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment";
140 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin"; 140 const char OobeUI::kScreenOobeReset[] = "reset";
141 const char OobeUI::kScreenAccountPicker[] = "account-picker"; 141 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin";
142 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch"; 142 const char OobeUI::kScreenAccountPicker[] = "account-picker";
143 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable"; 143 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
144 const char OobeUI::kScreenErrorMessage[] = "error-message"; 144 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable";
145 const char OobeUI::kScreenUserImagePicker[] = "user-image"; 145 const char OobeUI::kScreenErrorMessage[] = "error-message";
146 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 146 const char OobeUI::kScreenUserImagePicker[] = "user-image";
147 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 147 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
148 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
148 const char OobeUI::kScreenManagedUserCreationFlow[] 149 const char OobeUI::kScreenManagedUserCreationFlow[]
149 = "managed-user-creation"; 150 = "managed-user-creation";
150 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 151 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
151 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid"; 152 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
152 const char OobeUI::kScreenHIDDetection[] = "hid-detection"; 153 const char OobeUI::kScreenHIDDetection[] = "hid-detection";
153 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash"; 154 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
154 const char OobeUI::kScreenConfirmPassword[] = "confirm-password"; 155 const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
155 const char OobeUI::kScreenFatalError[] = "fatal-error"; 156 const char OobeUI::kScreenFatalError[] = "fatal-error";
156 157
157 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 158 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
158 : WebUIController(web_ui), 159 : WebUIController(web_ui),
159 core_handler_(NULL), 160 core_handler_(NULL),
160 network_dropdown_handler_(NULL), 161 network_dropdown_handler_(NULL),
161 update_screen_handler_(NULL), 162 update_screen_handler_(NULL),
162 network_screen_actor_(NULL), 163 network_screen_actor_(NULL),
163 eula_screen_actor_(NULL), 164 eula_screen_actor_(NULL),
164 hid_detection_screen_actor_(NULL), 165 hid_detection_screen_actor_(NULL),
165 reset_screen_actor_(NULL), 166 reset_screen_actor_(NULL),
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation(); 393 system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
393 localized_strings->SetString("highlightStrength", 394 localized_strings->SetString("highlightStrength",
394 keyboard_driven_oobe ? "strong" : "normal"); 395 keyboard_driven_oobe ? "strong" : "normal");
395 396
396 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI(); 397 bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
397 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off"); 398 localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
398 } 399 }
399 400
400 void OobeUI::InitializeScreenMaps() { 401 void OobeUI::InitializeScreenMaps() {
401 screen_names_.resize(SCREEN_UNKNOWN); 402 screen_names_.resize(SCREEN_UNKNOWN);
403 screen_names_[SCREEN_OOBE_HID_DETECTION] = kScreenOobeHIDDetection;
402 screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork; 404 screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork;
403 screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula; 405 screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula;
404 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate; 406 screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate;
405 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment; 407 screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
406 screen_names_[SCREEN_OOBE_RESET] = kScreenOobeReset; 408 screen_names_[SCREEN_OOBE_RESET] = kScreenOobeReset;
407 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin; 409 screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
408 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker; 410 screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker;
409 screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch; 411 screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch;
410 screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable; 412 screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable;
411 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage; 413 screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 observer_list_, 506 observer_list_,
505 OnCurrentScreenChanged(current_screen_, new_screen)); 507 OnCurrentScreenChanged(current_screen_, new_screen));
506 current_screen_ = new_screen; 508 current_screen_ = new_screen;
507 } else { 509 } else {
508 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 510 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
509 current_screen_ = SCREEN_UNKNOWN; 511 current_screen_ = SCREEN_UNKNOWN;
510 } 512 }
511 } 513 }
512 514
513 } // namespace chromeos 515 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698