arc: Add splash screen for ARC++ Kiosk startup

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

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 587d7619079929e40ec332dfd859f6df3ea5b0c6..fd0077fbf37d5b35cc1c1e88fd6f8645d5b96d18 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -31,6 +31,7 @@
 #include "chrome/browser/ui/ash/ash_util.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/arc_kiosk_splash_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_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"
@@ -81,13 +82,12 @@ namespace chromeos {
 
 namespace {
 
-const char* kKnownDisplayTypes[] = {
-  OobeUI::kOobeDisplay,
-  OobeUI::kLoginDisplay,
-  OobeUI::kLockDisplay,
-  OobeUI::kUserAddingDisplay,
-  OobeUI::kAppLaunchSplashDisplay
-};
+const char* kKnownDisplayTypes[] = {OobeUI::kOobeDisplay,
+                                    OobeUI::kLoginDisplay,
+                                    OobeUI::kLockDisplay,
+                                    OobeUI::kUserAddingDisplay,
+                                    OobeUI::kAppLaunchSplashDisplay,
+                                    OobeUI::kArcKioskSplashDisplay};
 
 OobeScreen kDimOverlayScreenIds[] = {
   OobeScreen::SCREEN_CONFIRM_PASSWORD,
@@ -201,6 +201,7 @@ const char OobeUI::kLoginDisplay[] = "login";
 const char OobeUI::kLockDisplay[] = "lock";
 const char OobeUI::kUserAddingDisplay[] = "user-adding";
 const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash";
+const char OobeUI::kArcKioskSplashDisplay[] = "arc-kiosk-splash";
 
 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui) {
@@ -322,6 +323,11 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
   app_launch_splash_screen_actor_ = app_launch_splash_screen_handler.get();
   AddScreenHandler(std::move(app_launch_splash_screen_handler));
 
+  auto arc_kiosk_splash_screen_handler =
+      base::MakeUnique<ArcKioskSplashScreenHandler>();
+  arc_kiosk_splash_screen_actor_ = arc_kiosk_splash_screen_handler.get();
+  AddScreenHandler(std::move(arc_kiosk_splash_screen_handler));
+
   if (display_type_ == kOobeDisplay) {
     auto controller_pairing_handler =
         base::MakeUnique<ControllerPairingScreenHandler>();
@@ -481,6 +487,10 @@ AppLaunchSplashScreenActor*
   return app_launch_splash_screen_actor_;
 }
 
+ArcKioskSplashScreenActor* OobeUI::GetArcKioskSplashScreenActor() {
+  return arc_kiosk_splash_screen_actor_;
+}
+
 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
   for (size_t i = 0; i < handlers_.size(); ++i) {