Redirect to the enterprise enrollment screen during remora and shark pairing

chrome/browser/chromeos/login/enrollment/enrollment_screen.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/enterprise_metrics.h"
 
+namespace pairing_chromeos {
+class ControllerPairingController;
+}
+
 namespace chromeos {
 
 class ScreenObserver;
 
 // The screen implementation that links the enterprise enrollment UI into the
 // OOBE wizard.
 class EnrollmentScreen
     : public WizardScreen,
       public EnrollmentScreenActor::Controller {
  public:
   EnrollmentScreen(ScreenObserver* observer,
                    EnrollmentScreenActor* actor);
   virtual ~EnrollmentScreen();
 
-  void SetParameters(EnrollmentScreenActor::EnrollmentMode enrollment_mode,
-                     const std::string& management_domain,
-                     const std::string& enrollment_user,
-                     const std::string& auth_token);
+  void SetParameters(
+      EnrollmentScreenActor::EnrollmentMode enrollment_mode,
+      const std::string& management_domain,
+      const std::string& enrollment_user,
+      const std::string& auth_token,

[achuithb, 2014/09/05 00:26:23]

Maybe we should just pass in a callback instead:
base::Bind(remora_controller,
&ControllerPairingController::OnAuthenticationDone, "", auth_token)

that way we don't need to keep track of the auth_token or the controller.

[Zachary Kuznia, 2014/09/09 00:51:53]

auth_token_ and the controller are actually mutually exclusive; one is used for
remora and the other for shark.

+      pairing_chromeos::ControllerPairingController* remora_controller);
 
   // WizardScreen implementation:
   virtual void PrepareToShow() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual std::string GetName() const OVERRIDE;
 
   // EnrollmentScreenActor::Controller implementation:
   virtual void OnLoginDone(const std::string& user) OVERRIDE;
   virtual void OnAuthError(const GoogleServiceAuthError& error) OVERRIDE;
@@ skipping 41 matching lines @@
   void ShowSigninScreen();
 
   // Convenience helper to check for auto enrollment mode.
   bool is_auto_enrollment() const {
     return enrollment_mode_ == EnrollmentScreenActor::ENROLLMENT_MODE_AUTO;
   }
 
   EnrollmentScreenActor* actor_;
   EnrollmentScreenActor::EnrollmentMode enrollment_mode_;
   bool enrollment_failed_once_;
+  pairing_chromeos::ControllerPairingController* remora_controller_;

[achuithb, 2014/09/05 00:26:23]

Maybe move this up next to actor_?

[Zachary Kuznia, 2014/09/09 00:51:53]

Done.

   bool remora_token_sent_;
   std::string user_;
   std::string auth_token_;
   int lockbox_init_duration_;
   base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_