Chromium Code Reviews| Index: chrome/browser/chromeos/login/screens/host_pairing_screen.cc |
| diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc |
| index 075297391b3f62223d60fdbed105b71056f96a0f..c7decfa79e80bc10f47f8244f741bd2caf8b87ab 100644 |
| --- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc |
| +++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc |
| @@ -63,6 +63,10 @@ void HostPairingScreen::PairingStageChanged(Stage new_stage) { |
| std::string desired_page; |
| switch (new_stage) { |
| + case HostPairingController::STAGE_NONE: |
| + case HostPairingController::STAGE_INITIALIZATION_ERROR: { |
| + break; |
| + } |
| case HostPairingController::STAGE_WAITING_FOR_CONTROLLER: |
| case HostPairingController::STAGE_WAITING_FOR_CONTROLLER_AFTER_UPDATE: { |
| desired_page = kPageWelcome; |
| @@ -98,11 +102,7 @@ void HostPairingScreen::PairingStageChanged(Stage new_stage) { |
| break; |
| } |
| case HostPairingController::STAGE_FINISHED: { |
| - get_screen_observer()->OnExit(WizardController::HOST_PAIRING_FINISHED); |
| - break; |
| - } |
| - default: { |
| - NOTREACHED(); |
| + // This page is closed in EnrollHost. |
| break; |
| } |
| } |
| @@ -122,9 +122,8 @@ void HostPairingScreen::ConfigureHost(bool accepted_eula, |
| } |
| void HostPairingScreen::EnrollHost(const std::string& auth_token) { |
| - // TODO(zork,achuith): Enroll device, send error on error. |
| - // (http://crbug.com/374990) |
| - controller_->SetEnrollmentComplete(true); |
| + WizardController::default_controller()->OnEnrollmentAuthTokenReceived( |
| + auth_token); |
|
dzhioev (left Google)
2014/09/09 01:35:41
You need to remove |this| from |controller_|'s obs
Zachary Kuznia
2014/09/09 02:17:51
Done.
|
| } |
| void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) { |