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

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

Issue 669623006: Add a "device disabled" OOBE screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits. Created 6 years, 2 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/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/chrome_browser_chromeos.gypi » ('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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/browser_process_platform_part.h" 12 #include "chrome/browser/browser_process_platform_part.h"
13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
14 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h" 14 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
15 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 15 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
17 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 17 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
18 #include "chrome/browser/chromeos/system/input_device_settings.h" 18 #include "chrome/browser/chromeos/system/input_device_settings.h"
19 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" 19 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/webui/about_ui.h" 21 #include "chrome/browser/ui/webui/about_ui.h"
22 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 22 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
23 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h" 23 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h"
24 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
25 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h" 25 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h"
26 #include "chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler. h"
26 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" 27 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
27 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 28 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
28 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 29 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
29 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 30 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
30 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 31 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
31 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h" 32 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h"
32 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" 33 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
33 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h" 34 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h"
34 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h" 35 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h"
35 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" 36 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 "supervised-user-creation"; 172 "supervised-user-creation";
172 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 173 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
173 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid"; 174 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
174 const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check"; 175 const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check";
175 const char OobeUI::kScreenHIDDetection[] = "hid-detection"; 176 const char OobeUI::kScreenHIDDetection[] = "hid-detection";
176 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash"; 177 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
177 const char OobeUI::kScreenConfirmPassword[] = "confirm-password"; 178 const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
178 const char OobeUI::kScreenFatalError[] = "fatal-error"; 179 const char OobeUI::kScreenFatalError[] = "fatal-error";
179 const char OobeUI::kScreenControllerPairing[] = "controller-pairing"; 180 const char OobeUI::kScreenControllerPairing[] = "controller-pairing";
180 const char OobeUI::kScreenHostPairing[] = "host-pairing"; 181 const char OobeUI::kScreenHostPairing[] = "host-pairing";
182 const char OobeUI::kScreenDeviceDisabled[] = "device-disabled";
181 183
182 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 184 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
183 : WebUIController(web_ui), 185 : WebUIController(web_ui),
184 core_handler_(NULL), 186 core_handler_(NULL),
185 network_dropdown_handler_(NULL), 187 network_dropdown_handler_(NULL),
186 update_screen_handler_(NULL), 188 update_screen_handler_(NULL),
187 network_screen_actor_(NULL), 189 network_screen_actor_(NULL),
188 eula_screen_actor_(NULL), 190 eula_screen_actor_(NULL),
189 hid_detection_screen_actor_(NULL), 191 hid_detection_screen_actor_(NULL),
190 reset_screen_actor_(NULL), 192 reset_screen_actor_(NULL),
191 autolaunch_screen_actor_(NULL), 193 autolaunch_screen_actor_(NULL),
192 kiosk_enable_screen_actor_(NULL), 194 kiosk_enable_screen_actor_(NULL),
193 wrong_hwid_screen_actor_(NULL), 195 wrong_hwid_screen_actor_(NULL),
194 auto_enrollment_check_screen_actor_(NULL), 196 auto_enrollment_check_screen_actor_(NULL),
195 supervised_user_creation_screen_actor_(NULL), 197 supervised_user_creation_screen_actor_(NULL),
198 app_launch_splash_screen_actor_(NULL),
199 controller_pairing_screen_actor_(NULL),
200 host_pairing_screen_actor_(NULL),
201 device_disabled_screen_actor_(NULL),
196 error_screen_handler_(NULL), 202 error_screen_handler_(NULL),
197 signin_screen_handler_(NULL), 203 signin_screen_handler_(NULL),
198 terms_of_service_screen_actor_(NULL), 204 terms_of_service_screen_actor_(NULL),
199 user_image_screen_actor_(NULL), 205 user_image_screen_actor_(NULL),
200 kiosk_app_menu_handler_(NULL), 206 kiosk_app_menu_handler_(NULL),
201 current_screen_(SCREEN_UNKNOWN), 207 current_screen_(SCREEN_UNKNOWN),
202 previous_screen_(SCREEN_UNKNOWN), 208 previous_screen_(SCREEN_UNKNOWN),
203 ready_(false) { 209 ready_(false) {
204 display_type_ = GetDisplayType(url); 210 display_type_ = GetDisplayType(url);
205 InitializeScreenMaps(); 211 InitializeScreenMaps();
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 controller_pairing_screen_actor_ = handler; 315 controller_pairing_screen_actor_ = handler;
310 AddScreenHandler(handler); 316 AddScreenHandler(handler);
311 } 317 }
312 318
313 if (display_type_ == kOobeDisplay) { 319 if (display_type_ == kOobeDisplay) {
314 HostPairingScreenHandler* handler = new HostPairingScreenHandler(); 320 HostPairingScreenHandler* handler = new HostPairingScreenHandler();
315 host_pairing_screen_actor_ = handler; 321 host_pairing_screen_actor_ = handler;
316 AddScreenHandler(handler); 322 AddScreenHandler(handler);
317 } 323 }
318 324
325 DeviceDisabledScreenHandler* device_disabled_screen_handler =
326 new DeviceDisabledScreenHandler;
327 device_disabled_screen_actor_ = device_disabled_screen_handler;
328 AddScreenHandler(device_disabled_screen_handler);
329
319 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. 330 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
320 kiosk_app_menu_handler_ = new KioskAppMenuHandler(network_state_informer_); 331 kiosk_app_menu_handler_ = new KioskAppMenuHandler(network_state_informer_);
321 web_ui->AddMessageHandler(kiosk_app_menu_handler_); 332 web_ui->AddMessageHandler(kiosk_app_menu_handler_);
322 333
323 base::DictionaryValue localized_strings; 334 base::DictionaryValue localized_strings;
324 GetLocalizedStrings(&localized_strings); 335 GetLocalizedStrings(&localized_strings);
325 336
326 Profile* profile = Profile::FromWebUI(web_ui); 337 Profile* profile = Profile::FromWebUI(web_ui);
327 // Set up the chrome://theme/ source, for Chrome logo. 338 // Set up the chrome://theme/ source, for Chrome logo.
328 ThemeSource* theme = new ThemeSource(profile); 339 ThemeSource* theme = new ThemeSource(profile);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 } 409 }
399 410
400 ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() { 411 ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() {
401 return controller_pairing_screen_actor_; 412 return controller_pairing_screen_actor_;
402 } 413 }
403 414
404 HostPairingScreenActor* OobeUI::GetHostPairingScreenActor() { 415 HostPairingScreenActor* OobeUI::GetHostPairingScreenActor() {
405 return host_pairing_screen_actor_; 416 return host_pairing_screen_actor_;
406 } 417 }
407 418
419 DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() {
420 return device_disabled_screen_actor_;
421 }
422
408 UserImageScreenActor* OobeUI::GetUserImageScreenActor() { 423 UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
409 return user_image_screen_actor_; 424 return user_image_screen_actor_;
410 } 425 }
411 426
412 ErrorScreenActor* OobeUI::GetErrorScreenActor() { 427 ErrorScreenActor* OobeUI::GetErrorScreenActor() {
413 return error_screen_handler_; 428 return error_screen_handler_;
414 } 429 }
415 430
416 SupervisedUserCreationScreenHandler* 431 SupervisedUserCreationScreenHandler*
417 OobeUI::GetSupervisedUserCreationScreenActor() { 432 OobeUI::GetSupervisedUserCreationScreenActor() {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 screen_names_[SCREEN_CREATE_SUPERVISED_USER_FLOW] = 488 screen_names_[SCREEN_CREATE_SUPERVISED_USER_FLOW] =
474 kScreenSupervisedUserCreationFlow; 489 kScreenSupervisedUserCreationFlow;
475 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService; 490 screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
476 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID; 491 screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
477 screen_names_[SCREEN_AUTO_ENROLLMENT_CHECK] = kScreenAutoEnrollmentCheck; 492 screen_names_[SCREEN_AUTO_ENROLLMENT_CHECK] = kScreenAutoEnrollmentCheck;
478 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash; 493 screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
479 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword; 494 screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword;
480 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError; 495 screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
481 screen_names_[SCREEN_OOBE_CONTROLLER_PAIRING] = kScreenControllerPairing; 496 screen_names_[SCREEN_OOBE_CONTROLLER_PAIRING] = kScreenControllerPairing;
482 screen_names_[SCREEN_OOBE_HOST_PAIRING] = kScreenHostPairing; 497 screen_names_[SCREEN_OOBE_HOST_PAIRING] = kScreenHostPairing;
498 screen_names_[SCREEN_DEVICE_DISABLED] = kScreenDeviceDisabled;
483 499
484 screen_ids_.clear(); 500 screen_ids_.clear();
485 for (size_t i = 0; i < screen_names_.size(); ++i) 501 for (size_t i = 0; i < screen_names_.size(); ++i)
486 screen_ids_[screen_names_[i]] = static_cast<Screen>(i); 502 screen_ids_[screen_names_[i]] = static_cast<Screen>(i);
487 } 503 }
488 504
489 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) { 505 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
490 web_ui()->AddMessageHandler(handler); 506 web_ui()->AddMessageHandler(handler);
491 handlers_.push_back(handler); 507 handlers_.push_back(handler);
492 } 508 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 DCHECK(screen_ids_.count(screen)) 578 DCHECK(screen_ids_.count(screen))
563 << "Screen should be registered in InitializeScreenMaps()"; 579 << "Screen should be registered in InitializeScreenMaps()";
564 Screen new_screen = screen_ids_[screen]; 580 Screen new_screen = screen_ids_[screen];
565 FOR_EACH_OBSERVER(Observer, 581 FOR_EACH_OBSERVER(Observer,
566 observer_list_, 582 observer_list_,
567 OnCurrentScreenChanged(current_screen_, new_screen)); 583 OnCurrentScreenChanged(current_screen_, new_screen));
568 current_screen_ = new_screen; 584 current_screen_ = new_screen;
569 } 585 }
570 586
571 } // namespace chromeos 587 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698