kiosk: Show enrollment screen first if needed.

chrome/browser/chromeos/login/wizard_controller.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/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 402 matching lines @@
 }
 
 void WizardController::SkipToLoginForTesting(
     const LoginScreenContext& context) {
   StartupUtils::MarkEulaAccepted();
   PerformPostEulaActions();
   PerformPostUpdateActions();
   ShowLoginScreen(context);
 }
 
-void WizardController::SkipPostLoginScreensForTesting() {
-  skip_post_login_screens_ = true;
-}
-
 void WizardController::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void WizardController::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void WizardController::OnSessionStart() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnSessionStart());
@@ skipping 279 matching lines @@
       ShowNetworkScreen();
     } else {
       ShowLoginScreen(LoginScreenContext());
     }
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, chromeos::ScreenObserver overrides:
 void WizardController::OnExit(ExitCodes exit_code) {
-  LOG(INFO) << "Wizard screen exit code: " << exit_code;
+  VLOG(1) << "Wizard screen exit code: " << exit_code;
   switch (exit_code) {
     case NETWORK_CONNECTED:
       OnNetworkConnected();
       break;
     case CONNECTION_FAILED:
       OnConnectionFailed();
       break;
     case UPDATE_INSTALLED:
     case UPDATE_NOUPDATE:
       OnUpdateCompleted();
@@ skipping 83 matching lines @@
 
 void WizardController::AutoLaunchKioskApp() {
   KioskAppManager::App app_data;
   std::string app_id = KioskAppManager::Get()->GetAutoLaunchApp();
   CHECK(KioskAppManager::Get()->GetApp(app_id, &app_data));
 
   host_->StartAppLaunch(app_id);
 }
 
 // static
+void WizardController::SetZeroDelays() {
+  kShowDelayMs = 0;
+  zero_delay_enabled_ = true;
+}
+
+// static
 bool WizardController::IsZeroDelayEnabled() {
   return zero_delay_enabled_;
 }
 
 // static
-void WizardController::SetZeroDelays() {
-  kShowDelayMs = 0;
-  zero_delay_enabled_ = true;
+void WizardController::SkipPostLoginScreensForTesting() {
+  skip_post_login_screens_ = true;
 }
 
-bool WizardController::ShouldAutoStartEnrollment() const {
+// static
+bool WizardController::ShouldAutoStartEnrollment() {
   return g_browser_process->browser_policy_connector()->
       GetDeviceCloudPolicyManager()->ShouldAutoStartEnrollment();
 }
 
 bool WizardController::CanExitEnrollment() const {
   return g_browser_process->browser_policy_connector()->
       GetDeviceCloudPolicyManager()->CanExitEnrollment();
 }
 
 void WizardController::OnLocalStateInitialized(bool /* succeeded */) {
   if (GetLocalState()->GetInitializationStatus() !=
       PrefService::INITIALIZATION_STATUS_ERROR) {
     return;
   }
   GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR);
   SetStatusAreaVisible(false);
   ShowErrorScreen();
 }
 
 PrefService* WizardController::GetLocalState() {
   if (local_state_for_testing_)
     return local_state_for_testing_;
   return g_browser_process->local_state();
 }
 
 }  // namespace chromeos