Network connectivity errors handling (incl. CP) for enrollment flow

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 226 matching lines @@
   AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
       new AutoEnrollmentCheckScreenHandler();
   auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
   AddScreenHandler(auto_enrollment_check_screen_handler);
 
   HIDDetectionScreenHandler* hid_detection_screen_handler =
       new HIDDetectionScreenHandler(core_handler_);
   hid_detection_screen_actor_ = hid_detection_screen_handler;
   AddScreenHandler(hid_detection_screen_handler);
 
+  error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
+  AddScreenHandler(error_screen_handler_);
+
   EnrollmentScreenHandler* enrollment_screen_handler =
-      new EnrollmentScreenHandler();
+      new EnrollmentScreenHandler(network_state_informer_,
+                                  error_screen_handler_);
   enrollment_screen_actor_ = enrollment_screen_handler;
   AddScreenHandler(enrollment_screen_handler);
 
   TermsOfServiceScreenHandler* terms_of_service_screen_handler =
       new TermsOfServiceScreenHandler;
   terms_of_service_screen_actor_ = terms_of_service_screen_handler;
   AddScreenHandler(terms_of_service_screen_handler);
 
   UserImageScreenHandler* user_image_screen_handler =
       new UserImageScreenHandler();
   user_image_screen_actor_ = user_image_screen_handler;
   AddScreenHandler(user_image_screen_handler);
 
-  error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
-  AddScreenHandler(error_screen_handler_);
-
   gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_);
   AddScreenHandler(gaia_screen_handler_);
 
   signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,
                                                    error_screen_handler_,
                                                    core_handler_,
                                                    gaia_screen_handler_);
   AddScreenHandler(signin_screen_handler_);
 
   AppLaunchSplashScreenHandler* app_launch_splash_screen_handler =
@@ skipping 236 matching lines @@
   observer_list_.RemoveObserver(observer);
 }
 
 const std::string& OobeUI::GetScreenName(Screen screen) const {
   DCHECK(screen >= 0 && screen < SCREEN_UNKNOWN);
   return screen_names_[static_cast<size_t>(screen)];
 }
 
 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
   previous_screen_ = current_screen_;
-  if (screen_ids_.count(screen)) {
-    Screen new_screen = screen_ids_[screen];
-    FOR_EACH_OBSERVER(Observer,
-                      observer_list_,
-                      OnCurrentScreenChanged(current_screen_, new_screen));
-    current_screen_ = new_screen;
-  } else {
-    NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
-    current_screen_ = SCREEN_UNKNOWN;
-  }
+  DCHECK(screen_ids_.count(screen))
+      << "Screen should be registered in InitializeScreenMaps()";
+  Screen new_screen = screen_ids_[screen];
+  FOR_EACH_OBSERVER(Observer,
+                    observer_list_,
+                    OnCurrentScreenChanged(current_screen_, new_screen));
+  current_screen_ = new_screen;
 }
 
 }  // namespace chromeos