1) Add basic configuration (network connection, language, keyboard layout, timezone) setup page. 2)…

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

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 63329ef5bd04f1783132194512f267325e7c3d6f..219bf5ee0ceefa5b69d34b05429d268e9c56dfda 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -79,6 +79,14 @@ void HostPairingScreen::PairingStageChanged(Stage new_stage) {
                          remora_controller_->GetConfirmationCode());
       break;
     }
+    case HostPairingController::STAGE_SETUP_BASIC_CONFIGURATION: {
+      desired_page = kPageSetupBasicConfiguration;
+      break;
+    }
+    case HostPairingController::STAGE_SETUP_NETWOKR_ERROR: {

[dzhioev (left Google), 2015/12/15 23:07:23]

s/NETWOKR/NETWORK/

+      desired_page = kPageSetupNetworkError;
+      break;
+    }
     case HostPairingController::STAGE_WAITING_FOR_CREDENTIALS: {
       desired_page = kPageEnrollmentIntroduction;
       break;
@@ -87,6 +95,7 @@ void HostPairingScreen::PairingStageChanged(Stage new_stage) {
       desired_page = kPageEnrollment;
       context_.SetString(kContextKeyEnrollmentDomain,
                          remora_controller_->GetEnrollmentDomain());
+      break;
     }
     case HostPairingController::STAGE_ENROLLMENT_SUCCESS: {
       remora_controller_->RemoveObserver(this);