Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1661)

Unified Diff: chrome/browser/chromeos/login/screens/host_pairing_screen.cc

Issue 652743003: Fix update and enrollment flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: indent Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 40ec8703dcce4d1e3f06a0a1a1d0f2fa8fac401c..782cbf3ef0ca19ea285deccac8ffdf12103dd884 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -61,10 +61,6 @@ std::string HostPairingScreen::GetName() const {
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;
@@ -76,36 +72,17 @@ void HostPairingScreen::PairingStageChanged(Stage new_stage) {
controller_->GetConfirmationCode());
break;
}
- case HostPairingController::STAGE_UPDATING: {
- desired_page = kPageUpdate;
- context_.SetDouble(kContextKeyUpdateProgress, 0.0);
- break;
- }
- case HostPairingController::STAGE_WAITING_FOR_CREDENTIALS: {
- controller_->RemoveObserver(this);
- get_screen_observer()->OnExit(
- WizardController::HOST_PAIRING_FINISHED);
- // TODO(achuith, zork): Remove the rest of the stages.
- break;
- }
- case HostPairingController::STAGE_ENROLLING: {
- desired_page = kPageEnrollment;
- context_.SetString(kContextKeyEnrollmentDomain,
- controller_->GetEnrollmentDomain());
- break;
- }
- case HostPairingController::STAGE_ENROLLMENT_ERROR: {
- desired_page = kPageEnrollmentError;
- break;
- }
case HostPairingController::STAGE_PAIRING_DONE: {
desired_page = kPagePairingDone;
break;
}
- case HostPairingController::STAGE_FINISHED: {
- // This page is closed in EnrollHost.
+ case HostPairingController::STAGE_UPDATING: {
+ controller_->RemoveObserver(this);
+ get_screen_observer()->OnExit(WizardController::HOST_PAIRING_FINISHED);
break;
}
+ default:
+ break;
}
current_stage_ = new_stage;
context_.SetString(kContextKeyDeviceName, controller_->GetDeviceName());

Powered by Google App Engine
This is Rietveld 408576698