Redirect to the enterprise enrollment screen during remora and shark pairing

chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

 // Copyright 2014 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/screens/controller_pairing_screen.h"
 
 #include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 using namespace chromeos::controller_pairing;
 using namespace pairing_chromeos;
 
-namespace {
-const char* kTestAuthToken = "TestAuthToken";
-};
-
 namespace chromeos {
 
 ControllerPairingScreen::ControllerPairingScreen(
     ScreenObserver* observer,
     ControllerPairingScreenActor* actor,
     ControllerPairingController* controller)
     : WizardScreen(observer),
       actor_(actor),
       controller_(controller),
+      observing_controller_(true),
       current_stage_(ControllerPairingController::STAGE_NONE),
       device_preselected_(false) {
   actor_->SetDelegate(this);
   controller_->AddObserver(this);
 }
 
 ControllerPairingScreen::~ControllerPairingScreen() {
   if (actor_)
     actor_->SetDelegate(NULL);
-  controller_->RemoveObserver(this);
+  if (observing_controller_)
+    controller_->RemoveObserver(this);

[dzhioev (left Google), 2014/09/09 02:46:51]

nit: it is safe to try to remove observer, that is not in a list, so no need for
|if (observing_controller_)| check.

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

Done.

 }
 
 void ControllerPairingScreen::CommitContextChanges() {
   if (!context_.HasChanges())
     return;
   base::DictionaryValue diff;
   context_.GetChangesAndReset(&diff);
   if (actor_)
     actor_->OnContextChanged(diff);
 }
@@ skipping 20 matching lines @@
     actor_->Hide();
 }
 
 std::string ControllerPairingScreen::GetName() const {
   return WizardController::kControllerPairingScreenName;
 }
 
 // Overridden from ControllerPairingController::Observer:
 void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {
   DCHECK(new_stage != current_stage_);
+  DCHECK(observing_controller_);
 
   std::string desired_page;
   switch (new_stage) {
     case ControllerPairingController::STAGE_DEVICES_DISCOVERY: {
       desired_page = kPageDevicesDiscovery;
       context_.SetStringList(kContextKeyDevices, StringList());
       context_.SetString(kContextKeySelectedDevice, std::string());
       device_preselected_ = false;
       break;
     }
@@ skipping 17 matching lines @@
     }
     case ControllerPairingController::STAGE_HOST_UPDATE_IN_PROGRESS: {
       desired_page = kPageHostUpdate;
       break;
     }
     case ControllerPairingController::STAGE_HOST_CONNECTION_LOST: {
       desired_page = kPageHostConnectionLost;
       break;
     }
     case ControllerPairingController::STAGE_WAITING_FOR_CREDENTIALS: {
+      observing_controller_ = false;
+      controller_->RemoveObserver(this);
+      get_screen_observer()->OnExit(
+          WizardController::CONTROLLER_PAIRING_FINISHED);
+      // TODO: Move the rest of the stages to the proper location.
       desired_page = kPageEnrollmentIntroduction;
       break;
     }
     case ControllerPairingController::STAGE_HOST_ENROLLMENT_IN_PROGRESS: {
       desired_page = kPageHostEnrollment;
       break;
     }
     case ControllerPairingController::STAGE_HOST_ENROLLMENT_ERROR: {
       desired_page = kPageHostEnrollmentError;
       break;
@@ skipping 68 matching lines @@
   } else if (action == kActionRejectCode) {
     controller_->SetConfirmationCodeIsCorrect(false);
   } else if (action == kActionProceedToAuthentication) {
     context_.SetString(kContextKeyPage, kPageAuthentication);
     disable_controls = false;
   } else if (action == kActionEnroll) {
     const std::string account_id =
         gaia::SanitizeEmail(context_.GetString(kContextKeyAccountId));
     const std::string domain(gaia::ExtractDomainName(account_id));
     context_.SetString(kContextKeyEnrollmentDomain, domain);
-    // TODO(zork): Get proper credentials. (http://crbug.com/405744)
-    controller_->OnAuthenticationDone(domain, kTestAuthToken);
   } else if (action == kActionStartSession) {
     controller_->StartSession();
   }
   context_.SetBoolean(kContextKeyControlsDisabled, disable_controls);
   CommitContextChanges();
 }
 
 void ControllerPairingScreen::OnScreenContextChanged(
     const base::DictionaryValue& diff) {
   std::vector<std::string> changedKeys;
   context_.ApplyChanges(diff, &changedKeys);
   for (std::vector<std::string>::const_iterator key = changedKeys.begin();
        key != changedKeys.end();
        ++key) {
     if (*key == kContextKeySelectedDevice) {
       context_.SetBoolean(kContextKeyControlsDisabled,
                           context_.GetString(*key).empty());
       CommitContextChanges();
     }
   }
 }
 
 }  // namespace chromeos