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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 7427cce35540d717b2f0cc523ed698f5db918b01..9e3ac1ccd8f7c32f808e05b51f0ca58992d2e439 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
@@ -178,6 +179,7 @@ const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
const char OobeUI::kScreenFatalError[] = "fatal-error";
const char OobeUI::kScreenControllerPairing[] = "controller-pairing";
const char OobeUI::kScreenHostPairing[] = "host-pairing";
+const char OobeUI::kScreenDeviceDisabled[] = "device-disabled";
OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
: WebUIController(web_ui),
@@ -193,6 +195,10 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
wrong_hwid_screen_actor_(NULL),
auto_enrollment_check_screen_actor_(NULL),
supervised_user_creation_screen_actor_(NULL),
+ app_launch_splash_screen_actor_(NULL),
+ controller_pairing_screen_actor_(NULL),
+ host_pairing_screen_actor_(NULL),
+ device_disabled_screen_actor_(NULL),
error_screen_handler_(NULL),
signin_screen_handler_(NULL),
terms_of_service_screen_actor_(NULL),
@@ -316,6 +322,11 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
AddScreenHandler(handler);
}
+ DeviceDisabledScreenHandler* device_disabled_screen_handler =
+ new DeviceDisabledScreenHandler;
+ device_disabled_screen_actor_ = device_disabled_screen_handler;
+ AddScreenHandler(device_disabled_screen_handler);
+
// Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
kiosk_app_menu_handler_ = new KioskAppMenuHandler(network_state_informer_);
web_ui->AddMessageHandler(kiosk_app_menu_handler_);
@@ -405,6 +416,10 @@ HostPairingScreenActor* OobeUI::GetHostPairingScreenActor() {
return host_pairing_screen_actor_;
}
+DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() {
+ return device_disabled_screen_actor_;
+}
+
UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
return user_image_screen_actor_;
}
@@ -480,6 +495,7 @@ void OobeUI::InitializeScreenMaps() {
screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
screen_names_[SCREEN_OOBE_CONTROLLER_PAIRING] = kScreenControllerPairing;
screen_names_[SCREEN_OOBE_HOST_PAIRING] = kScreenHostPairing;
+ screen_names_[SCREEN_DEVICE_DISABLED] = kScreenDeviceDisabled;
screen_ids_.clear();
for (size_t i = 0; i < screen_names_.size(); ++i)
« 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