Refactor kiosk app launch to be part of login screen UI flow.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #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/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"
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
@@ skipping 102 matching lines @@
 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
 const char OobeUI::kScreenKioskEnable[]     = "kiosk-enable";
 const char OobeUI::kScreenErrorMessage[]    = "error-message";
 const char OobeUI::kScreenUserImagePicker[] = "user-image";
 const char OobeUI::kScreenTpmError[]        = "tpm-error-message";
 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
 const char OobeUI::kScreenManagedUserCreationFlow[]
                                             = "managed-user-creation";
 const char OobeUI::kScreenTermsOfService[]  = "terms-of-service";
 const char OobeUI::kScreenWrongHWID[]       = "wrong-hwid";
+const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
 
 OobeUI::OobeUI(content::WebUI* web_ui)
     : WebUIController(web_ui),
       core_handler_(NULL),
       network_dropdown_handler_(NULL),
       update_screen_handler_(NULL),
       network_screen_actor_(NULL),
       eula_screen_actor_(NULL),
       reset_screen_actor_(NULL),
       autolaunch_screen_actor_(NULL),
@@ skipping 74 matching lines @@
   AddScreenHandler(user_image_screen_handler);
 
   error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
   AddScreenHandler(error_screen_handler_);
 
   signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,
                                                    error_screen_handler_,
                                                    core_handler_);
   AddScreenHandler(signin_screen_handler_);
 
+  AppLaunchSplashScreenHandler* app_launch_splash_screen_handler =
+      new AppLaunchSplashScreenHandler();
+  AddScreenHandler(app_launch_splash_screen_handler);
+  app_launch_splash_screen_actor_ = app_launch_splash_screen_handler;
+
   // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
   kiosk_app_menu_handler_ = new KioskAppMenuHandler;
   web_ui->AddMessageHandler(kiosk_app_menu_handler_);
 
   base::DictionaryValue localized_strings;
   GetLocalizedStrings(&localized_strings);
 
   Profile* profile = Profile::FromWebUI(web_ui);
   // Set up the chrome://theme/ source, for Chrome logo.
   ThemeSource* theme = new ThemeSource(profile);
@@ skipping 69 matching lines @@
 
 ErrorScreenActor* OobeUI::GetErrorScreenActor() {
   return error_screen_handler_;
 }
 
 LocallyManagedUserCreationScreenHandler*
     OobeUI::GetLocallyManagedUserCreationScreenActor() {
   return locally_managed_user_creation_screen_actor_;
 }
 
+AppLaunchSplashScreenActor*
+      OobeUI::GetAppLaunchSplashScreenActor() {
+  return app_launch_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)
     handlers_[i]->GetLocalizedStrings(localized_strings);
   webui::SetFontAndTextDirection(localized_strings);
   kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings);
 
 #if defined(GOOGLE_CHROME_BUILD)
   localized_strings->SetString("buildType", "chrome");
 #else
@@ skipping 32 matching lines @@
   screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch;
   screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable;
   screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
   screen_names_[SCREEN_USER_IMAGE_PICKER] = kScreenUserImagePicker;
   screen_names_[SCREEN_TPM_ERROR] = kScreenTpmError;
   screen_names_[SCREEN_PASSWORD_CHANGED] = kScreenPasswordChanged;
   screen_names_[SCREEN_CREATE_MANAGED_USER_FLOW] =
       kScreenManagedUserCreationFlow;
   screen_names_[SCREEN_TERMS_OF_SERVICE] = kScreenTermsOfService;
   screen_names_[SCREEN_WRONG_HWID] = kScreenWrongHWID;
+  screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
 
   screen_ids_.clear();
   for (size_t i = 0; i < screen_names_.size(); ++i)
     screen_ids_[screen_names_[i]] = static_cast<Screen>(i);
 }
 
 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
   web_ui()->AddMessageHandler(handler);
   handlers_.push_back(handler);
 }
@@ skipping 42 matching lines @@
 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
   if (screen_ids_.count(screen)) {
     current_screen_ = screen_ids_[screen];
   } else {
     NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
     current_screen_ = SCREEN_UNKNOWN;
   }
 }
 
 }  // namespace chromeos