Redirect to the enterprise enrollment screen during remora and shark pairing

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 409 matching lines @@
   std::string enrollment_domain = GetForcedEnrollmentDomain();
   if (is_auto_enrollment) {
     mode = EnrollmentScreenActor::ENROLLMENT_MODE_AUTO;
   } else if (enrollment_recovery_) {
     mode = EnrollmentScreenActor::ENROLLMENT_MODE_RECOVERY;
     enrollment_domain = GetEnrollmentRecoveryDomain();
   } else if (ShouldAutoStartEnrollment() && !CanExitEnrollment()) {
     mode = EnrollmentScreenActor::ENROLLMENT_MODE_FORCED;
   }
 
-  screen->SetParameters(mode, enrollment_domain, user, auth_token_);
+  screen->SetParameters(mode, enrollment_domain, user, auth_token_,
+                        controller_pairing_controller_.get(),
+                        host_pairing_controller_.get());
   SetCurrentScreen(screen);
 }
 
 void WizardController::ShowResetScreen() {
   VLOG(1) << "Showing reset screen.";
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetScreen(kResetScreenName));
 }
 
 void WizardController::ShowKioskEnableScreen() {
@@ skipping 178 matching lines @@
   // TODO(nkostylev): Show message to the user explaining update error.
   // TODO(nkostylev): Update should be required during OOBE.
   // Temporary fix, need to migrate to new API. http://crosbug.com/4321
   OnUpdateCompleted();
 }
 
 void WizardController::EnableUserImageScreenReturnToPreviousHack() {
   user_image_screen_return_to_previous_hack_ = true;
 }
 
+void WizardController::OnEnrollmentAuthTokenReceived(
+    const std::string& token) {
+  // TODO(achuith, zork): This will be called via Bluetooth from a remote

[achuithb, 2014/09/09 09:02:03]

Don't need the TODO any more.

[Zachary Kuznia, 2014/09/09 23:53:58]

Done.

+  // controller.
+  VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
+  if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
+    StartupUtils::MarkEulaAccepted();
+    auth_token_ = token;
+    ShowEnrollmentScreen();
+  } else {
+    LOG(WARNING) << "Not in device enrollment.";
+  }
+}
+
 void WizardController::OnUserImageSelected() {
   if (user_image_screen_return_to_previous_hack_) {
     user_image_screen_return_to_previous_hack_ = false;
     DCHECK(previous_screen_);
     if (previous_screen_) {
       SetCurrentScreen(previous_screen_);
       return;
     }
   }
   if (!time_oobe_started_.is_null()) {
@@ skipping 568 matching lines @@
 
 bool WizardController::SetOnTimeZoneResolvedForTesting(
     const base::Closure& callback) {
   if (timezone_resolved_)
     return false;
 
   on_timezone_resolved_for_testing_ = callback;
   return true;
 }
 
-void WizardController::OnEnrollmentAuthTokenReceived(
-    const std::string& token) {
-  // TODO(achuith, zork): This will be called via Bluetooth from a remote
-  // controller.
-  VLOG(1) << "OnEnrollmentAuthTokenReceived " << token;
-  if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
-    StartupUtils::MarkEulaAccepted();
-    auth_token_ = token;
-    InitiateOOBEUpdate();
-  } else {
-    LOG(WARNING) << "Not in device enrollment.";
-  }
-}
-
 }  // namespace chromeos