ScreenObserver is renamed to BaseScreenDelegate.

chrome/browser/chromeos/login/screens/user_image_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/user_image_screen.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
 #include "chrome/browser/chromeos/login/login_utils.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/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
@@ skipping 23 matching lines @@
 const int kSyncTimeoutSeconds = 10;
 
 }  // namespace
 
 // static
 UserImageScreen* UserImageScreen::Get(ScreenManager* manager) {
   return static_cast<UserImageScreen*>(
       manager->GetScreen(WizardController::kUserImageScreenName));
 }
 
-UserImageScreen::UserImageScreen(ScreenObserver* screen_observer,
+UserImageScreen::UserImageScreen(BaseScreenDelegate* base_screen_delegate,
                                  UserImageScreenActor* actor)
-    : BaseScreen(screen_observer),
+    : BaseScreen(base_screen_delegate),
       actor_(actor),
       accept_photo_after_decoding_(false),
       selected_image_(user_manager::User::USER_IMAGE_INVALID),
       profile_picture_data_url_(url::kAboutBlankURL),
       profile_picture_absent_(false),
       is_screen_ready_(false),
       user_has_selected_image_(false) {
   actor_->SetDelegate(this);
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
@@ skipping 271 matching lines @@
 
 std::string UserImageScreen::profile_picture_data_url() {
   return profile_picture_data_url_;
 }
 
 void UserImageScreen::ExitScreen() {
   policy_registrar_.reset();
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
-  get_screen_observer()->OnExit(ScreenObserver::USER_IMAGE_SELECTED);
+  get_base_screen_delegate()->OnExit(BaseScreenDelegate::USER_IMAGE_SELECTED);
 }
 
 }  // namespace chromeos