| 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 43f7efc45c87b489942590e1e10aa74bfc0efe77..2b15592c919003eff6b1cd88d667b72cc643d778 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/browser/browser_about_handler.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
|
| +#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"
|
| #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
|
| #include "chrome/browser/chromeos/login/lock/screen_locker.h"
|
| #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
|
| @@ -21,6 +22,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/webui/about_ui.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h"
|
| +#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/enrollment_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
|
| @@ -150,6 +152,8 @@ const char OobeUI::kScreenManagedUserCreationFlow[]
|
| = "managed-user-creation";
|
| const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
|
| const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
|
| +const char OobeUI::kScreenAutoEnrollmentCheck[]
|
| + = "auto-enrollment-check";
|
| const char OobeUI::kScreenHIDDetection[] = "hid-detection";
|
| const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
|
| const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
|
| @@ -167,6 +171,7 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
|
| autolaunch_screen_actor_(NULL),
|
| kiosk_enable_screen_actor_(NULL),
|
| wrong_hwid_screen_actor_(NULL),
|
| + auto_enrollment_check_screen_actor_(NULL),
|
| locally_managed_user_creation_screen_actor_(NULL),
|
| error_screen_handler_(NULL),
|
| signin_screen_handler_(NULL),
|
| @@ -230,6 +235,11 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
|
| wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
|
| AddScreenHandler(wrong_hwid_screen_handler);
|
|
|
| + AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
|
| + new AutoEnrollmentCheckScreenHandler();
|
| + auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
|
| + AddScreenHandler(auto_enrollment_check_screen_handler);
|
| +
|
| HIDDetectionScreenHandler* hid_detection_screen_handler =
|
| new HIDDetectionScreenHandler();
|
| hid_detection_screen_actor_ = hid_detection_screen_handler;
|
| @@ -345,6 +355,10 @@ WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() {
|
| return wrong_hwid_screen_actor_;
|
| }
|
|
|
| +AutoEnrollmentCheckScreenActor* OobeUI::GetAutoEnrollmentCheckScreenActor() {
|
| + return auto_enrollment_check_screen_actor_;
|
| +}
|
| +
|
| HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() {
|
| return hid_detection_screen_actor_;
|
| }
|
| @@ -418,6 +432,7 @@ void OobeUI::InitializeScreenMaps() {
|
| kScreenManagedUserCreationFlow;
|
| screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
|
| screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
|
| + screen_names_[SCREEN_AUTO_ENROLLMENT_CHECK] = kScreenAutoEnrollmentCheck;
|
| screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
|
| screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword;
|
| screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
|
|
|