Add device disabling to OOBE flow

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 516 matching lines @@
   VLOG(1) << "Showing device disabled screen.";
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetScreen(kDeviceDisabledScreenName));
 }
 
 void WizardController::SkipToLoginForTesting(
     const LoginScreenContext& context) {
   VLOG(1) << "SkipToLoginForTesting.";
   StartupUtils::MarkEulaAccepted();
   PerformPostEulaActions();
-  OnAutoEnrollmentCheckCompleted();
+  OnDeviceNotDisabled();
 }
 
 void WizardController::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void WizardController::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
@@ skipping 176 matching lines @@
     SetCurrentScreen(previous_screen_);
   else
     ShowLoginScreen(LoginScreenContext());
 }
 
 void WizardController::OnAutoEnrollmentDone() {
   VLOG(1) << "Automagic enrollment done, resuming previous signin";
   ResumeLoginScreen();
 }
 
-void WizardController::OnAutoEnrollmentCheckCompleted() {
-  if (ShouldAutoStartEnrollment() || enrollment_recovery_) {
-    ShowEnrollmentScreen();
-  } else {
-    PerformOOBECompletedActions();
-    ShowLoginScreen(LoginScreenContext());
-  }
-}
-
 void WizardController::OnTermsOfServiceDeclined() {
   // If the user declines the Terms of Service, end the session and return to
   // the login screen.
   DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
 }
 
 void WizardController::OnTermsOfServiceAccepted() {
   // If the user accepts the Terms of Service, advance to the user image screen.
   ShowUserImageScreen();
 }
 
 void WizardController::OnControllerPairingFinished() {
   ShowAutoEnrollmentCheckScreen();
 }
 
 void WizardController::OnHostPairingFinished() {
   InitiateOOBEUpdate();
 }
 
+void WizardController::OnDeviceNotDisabled() {
+  if (skip_update_enroll_after_eula_ ||
+      ShouldAutoStartEnrollment() ||
+      enrollment_recovery_) {
+    ShowEnrollmentScreen();
+  } else {
+    PerformOOBECompletedActions();
+    ShowLoginScreen(LoginScreenContext());
+  }
+}
+
 void WizardController::InitiateOOBEUpdate() {
   VLOG(1) << "InitiateOOBEUpdate";
   PerformPostEulaActions();
   SetCurrentScreenSmooth(GetScreen(kUpdateScreenName), true);
   UpdateScreen::Get(this)->StartNetworkCheck();
 }
 
 void WizardController::StartTimezoneResolve() {
   geolocation_provider_.reset(new SimpleGeolocationProvider(
       g_browser_process->system_request_context(),
@@ skipping 189 matching lines @@
     case USER_IMAGE_SELECTED:
       OnUserImageSelected();
       break;
     case EULA_ACCEPTED:
       OnEulaAccepted();
       break;
     case EULA_BACK:
       ShowNetworkScreen();
       break;
     case ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED:
-      if (skip_update_enroll_after_eula_)
-        ShowEnrollmentScreen();
-      else
-        OnAutoEnrollmentCheckCompleted();
+      ShowDeviceDisabledScreen();
       break;
     case ENTERPRISE_ENROLLMENT_COMPLETED:
       OnEnrollmentDone();
       break;
     case ENTERPRISE_ENROLLMENT_BACK:
       ShowNetworkScreen();
       break;
     case RESET_CANCELED:
       OnResetCanceled();
       break;
@@ skipping 17 matching lines @@
       break;
     case WRONG_HWID_WARNING_SKIPPED:
       OnWrongHWIDWarningSkipped();
       break;
     case CONTROLLER_PAIRING_FINISHED:
       OnControllerPairingFinished();
       break;
     case HOST_PAIRING_FINISHED:
       OnHostPairingFinished();
       break;
+    case DEVICE_NOT_DISABLED:
+      OnDeviceNotDisabled();
+      break;
     default:
       NOTREACHED();
   }
 }
 
 void WizardController::OnSetUserNamePassword(const std::string& username,
                                              const std::string& password) {
   username_ = username;
   password_ = password;
 }
@@ skipping 275 matching lines @@
   if (accepted_eula) // Always true.
     StartupUtils::MarkEulaAccepted();
   SetUsageStatisticsReporting(send_reports);
   NetworkScreenActor* network_actor = oobe_display_->GetNetworkScreenActor();
   network_actor->SetApplicationLocale(lang);
   network_actor->SetTimezone(timezone);
   network_actor->SetInputMethod(keyboard_layout);
 }
 
 }  // namespace chromeos