ScreenObserver is renamed to BaseScreenDelegate.

chrome/browser/chromeos/login/enrollment/auto_enrollment_check_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/enrollment/auto_enrollment_check_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
-#include "chrome/browser/chromeos/login/screens/screen_observer.h"
+#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 
 namespace chromeos {
 
 // static
 AutoEnrollmentCheckScreen* AutoEnrollmentCheckScreen::Get(
     ScreenManager* manager) {
   return static_cast<AutoEnrollmentCheckScreen*>(
       manager->GetScreen(WizardController::kAutoEnrollmentCheckScreenName));
 }
 
 AutoEnrollmentCheckScreen::AutoEnrollmentCheckScreen(
-    ScreenObserver* observer,
+    BaseScreenDelegate* base_screen_delegate,
     AutoEnrollmentCheckScreenActor* actor)
-    : BaseScreen(observer),
+    : BaseScreen(base_screen_delegate),
       actor_(actor),
       captive_portal_status_(
           NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN),
       auto_enrollment_state_(policy::AUTO_ENROLLMENT_STATE_IDLE),
       histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")) {
   if (actor_)
     actor_->SetDelegate(this);
 }
 
 AutoEnrollmentCheckScreen::~AutoEnrollmentCheckScreen() {
@@ skipping 50 matching lines @@
 }
 
 void AutoEnrollmentCheckScreen::Hide() {
 }
 
 std::string AutoEnrollmentCheckScreen::GetName() const {
   return WizardController::kAutoEnrollmentCheckScreenName;
 }
 
 void AutoEnrollmentCheckScreen::OnExit() {
-  get_screen_observer()->OnExit(
-      ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+  get_base_screen_delegate()->OnExit(
+      BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 }
 
 void AutoEnrollmentCheckScreen::OnActorDestroyed(
     AutoEnrollmentCheckScreenActor* actor) {
   if (actor_ == actor)
     actor_ = NULL;
 }
 
 void AutoEnrollmentCheckScreen::OnPortalDetectionCompleted(
     const NetworkState* /* network */,
     const NetworkPortalDetector::CaptivePortalState& state) {
   UpdateState(state.status, auto_enrollment_state_);
 }
 
 void AutoEnrollmentCheckScreen::OnAutoEnrollmentCheckProgressed(
     policy::AutoEnrollmentState state) {
   UpdateState(captive_portal_status_, state);
 }
 
 void AutoEnrollmentCheckScreen::UpdateState(
     NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status,
     policy::AutoEnrollmentState new_auto_enrollment_state) {
   // Configure the error screen to show the approriate error message.
   if (!UpdateCaptivePortalStatus(new_captive_portal_status))
     UpdateAutoEnrollmentState(new_auto_enrollment_state);
 
   // Update the connecting indicator.
-  ErrorScreen* error_screen = get_screen_observer()->GetErrorScreen();
+  ErrorScreen* error_screen = get_base_screen_delegate()->GetErrorScreen();
   error_screen->ShowConnectingIndicator(
       new_auto_enrollment_state == policy::AUTO_ENROLLMENT_STATE_PENDING);
 
   // Determine whether a retry is in order.
   bool retry = (new_captive_portal_status ==
                 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) &&
                (captive_portal_status_ !=
                 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE);
 
   // Save the new state.
@@ skipping 28 matching lines @@
   switch (new_captive_portal_status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
       return false;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_OFFLINE);
       return true;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_PORTAL);
       if (captive_portal_status_ != new_captive_portal_status)
-        get_screen_observer()->GetErrorScreen()->FixCaptivePortal();
+        get_base_screen_delegate()->GetErrorScreen()->FixCaptivePortal();
       return true;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_PROXY);
       return true;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
       NOTREACHED() << "Bad status: CAPTIVE_PORTAL_STATUS_COUNT";
       return false;
   }
 
   // Return is required to avoid compiler warning.
@@ skipping 20 matching lines @@
 
   // Return is required to avoid compiler warning.
   NOTREACHED() << "bad state " << new_auto_enrollment_state;
   return false;
 }
 
 void AutoEnrollmentCheckScreen::ShowErrorScreen(
     ErrorScreen::ErrorState error_state) {
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
-  ErrorScreen* error_screen = get_screen_observer()->GetErrorScreen();
+  ErrorScreen* error_screen = get_base_screen_delegate()->GetErrorScreen();
   error_screen->SetUIState(ErrorScreen::UI_STATE_AUTO_ENROLLMENT_ERROR);
   error_screen->AllowGuestSignin(true);
   error_screen->SetErrorState(error_state,
                               network ? network->name() : std::string());
-  get_screen_observer()->ShowErrorScreen();
+  get_base_screen_delegate()->ShowErrorScreen();
   histogram_helper_->OnErrorShow(error_state);
 }
 
 void AutoEnrollmentCheckScreen::SignalCompletion() {
   NetworkPortalDetector::Get()->RemoveObserver(this);
   auto_enrollment_progress_subscription_.reset();
-  get_screen_observer()->OnExit(
-      ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
+  get_base_screen_delegate()->OnExit(
+      BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 }
 
 }  // namespace chromeos