ScreenObserver is renamed to BaseScreenDelegate.

chrome/browser/chromeos/login/screens/update_screen.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/chromeos/login/screens/update_screen.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_restrictions.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/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
-#include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_state.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 using pairing_chromeos::HostPairingController;
 
@@ skipping 58 matching lines @@
   InstanceSet::iterator found = instance_set.find(inst);
   return (found != instance_set.end());
 }
 
 // static
 UpdateScreen* UpdateScreen::Get(ScreenManager* manager) {
   return static_cast<UpdateScreen*>(
       manager->GetScreen(WizardController::kUpdateScreenName));
 }
 
-UpdateScreen::UpdateScreen(ScreenObserver* screen_observer,
+UpdateScreen::UpdateScreen(BaseScreenDelegate* base_screen_delegate,
                            UpdateScreenActor* actor,
                            HostPairingController* remora_controller)
-    : BaseScreen(screen_observer),
+    : BaseScreen(base_screen_delegate),
       state_(STATE_IDLE),
       reboot_check_delay_(0),
       is_checking_for_update_(true),
       is_downloading_update_(false),
       is_ignore_update_deadlines_(false),
       is_shown_(false),
       ignore_idle_status_(true),
       actor_(actor),
       remora_controller_(remora_controller),
       is_first_detection_notification_(true),
@@ skipping 218 matching lines @@
 }
 
 void UpdateScreen::ExitUpdate(UpdateScreen::ExitReason reason) {
   DBusThreadManager::Get()->GetUpdateEngineClient()->RemoveObserver(this);
   NetworkPortalDetector::Get()->RemoveObserver(this);
   SetHostPairingControllerStatus(HostPairingController::UPDATE_STATUS_UPDATED);
 
 
   switch (reason) {
     case REASON_UPDATE_CANCELED:
-      get_screen_observer()->OnExit(ScreenObserver::UPDATE_NOUPDATE);
+      get_base_screen_delegate()->OnExit(BaseScreenDelegate::UPDATE_NOUPDATE);
       break;
     case REASON_UPDATE_INIT_FAILED:
-      get_screen_observer()->OnExit(
-          ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE);
+      get_base_screen_delegate()->OnExit(
+          BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE);
       break;
     case REASON_UPDATE_NON_CRITICAL:
     case REASON_UPDATE_ENDED:
       {
         UpdateEngineClient* update_engine_client =
             DBusThreadManager::Get()->GetUpdateEngineClient();
         switch (update_engine_client->GetLastStatus().status) {
           case UpdateEngineClient::UPDATE_STATUS_ATTEMPTING_ROLLBACK:
             break;
           case UpdateEngineClient::UPDATE_STATUS_UPDATE_AVAILABLE:
           case UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT:
           case UpdateEngineClient::UPDATE_STATUS_DOWNLOADING:
           case UpdateEngineClient::UPDATE_STATUS_FINALIZING:
           case UpdateEngineClient::UPDATE_STATUS_VERIFYING:
             DCHECK(!HasCriticalUpdate());
             // Noncritical update, just exit screen as if there is no update.
             // no break
           case UpdateEngineClient::UPDATE_STATUS_IDLE:
-            get_screen_observer()->OnExit(ScreenObserver::UPDATE_NOUPDATE);
+            get_base_screen_delegate()->OnExit(
+                BaseScreenDelegate::UPDATE_NOUPDATE);
             break;
           case UpdateEngineClient::UPDATE_STATUS_ERROR:
           case UpdateEngineClient::UPDATE_STATUS_REPORTING_ERROR_EVENT:
-            get_screen_observer()->OnExit(is_checking_for_update_ ?
-                ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE :
-                ScreenObserver::UPDATE_ERROR_UPDATING);
+            get_base_screen_delegate()->OnExit(
+                is_checking_for_update_
+                    ? BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE
+                    : BaseScreenDelegate::UPDATE_ERROR_UPDATING);
             break;
           default:
             NOTREACHED();
         }
       }
       break;
     default:
       NOTREACHED();
   }
 }
 
 void UpdateScreen::OnWaitForRebootTimeElapsed() {
   LOG(ERROR) << "Unable to reboot - asking user for a manual reboot.";
   MakeSureScreenIsShown();
   if (actor_)
     actor_->ShowManualRebootInfo();
 }
 
 void UpdateScreen::MakeSureScreenIsShown() {
   if (!is_shown_)
-    get_screen_observer()->ShowCurrentScreen();
+    get_base_screen_delegate()->ShowCurrentScreen();
 }
 
 void UpdateScreen::SetRebootCheckDelay(int seconds) {
   if (seconds <= 0)
     reboot_timer_.Stop();
   DCHECK(!reboot_timer_.IsRunning());
   reboot_check_delay_ = seconds;
 }
 
 void UpdateScreen::SetIgnoreIdleStatus(bool ignore_idle_status) {
@@ skipping 74 matching lines @@
 }
 
 void UpdateScreen::OnConnectToNetworkRequested() {
   if (state_ == STATE_ERROR) {
     LOG(WARNING) << "Hiding error message since AP was reselected";
     StartUpdateCheck();
   }
 }
 
 ErrorScreen* UpdateScreen::GetErrorScreen() {
-  return get_screen_observer()->GetErrorScreen();
+  return get_base_screen_delegate()->GetErrorScreen();
 }
 
 void UpdateScreen::StartUpdateCheck() {
   NetworkPortalDetector::Get()->RemoveObserver(this);
   if (state_ == STATE_ERROR)
     HideErrorMessage();
   state_ = STATE_UPDATE;
   DBusThreadManager::Get()->GetUpdateEngineClient()->AddObserver(this);
   VLOG(1) << "Initiate update check";
   DBusThreadManager::Get()->GetUpdateEngineClient()->RequestUpdateCheck(
       base::Bind(StartUpdateCallback, this));
 }
 
 void UpdateScreen::ShowErrorMessage() {
   LOG(WARNING) << "UpdateScreen::ShowErrorMessage()";
   state_ = STATE_ERROR;
   GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_UPDATE);
-  get_screen_observer()->ShowErrorScreen();
+  get_base_screen_delegate()->ShowErrorScreen();
   histogram_helper_->OnErrorShow(GetErrorScreen()->GetErrorState());
 }
 
 void UpdateScreen::HideErrorMessage() {
   LOG(WARNING) << "UpdateScreen::HideErrorMessage()";
-  get_screen_observer()->HideErrorScreen(this);
+  get_base_screen_delegate()->HideErrorScreen(this);
   histogram_helper_->OnErrorHide();
 }
 
 void UpdateScreen::UpdateErrorMessage(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalStatus status) {
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
       NOTREACHED();
       break;
@@ skipping 22 matching lines @@
 }
 
 void UpdateScreen::SetHostPairingControllerStatus(
     HostPairingController::UpdateStatus update_status) {
   if (remora_controller_) {
     remora_controller_->OnUpdateStatusChanged(update_status);
   }
 }
 
 }  // namespace chromeos