| Index: chrome/browser/chromeos/login/screens/user_image_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc
|
| index 675ba25175d1b86dfd42ada0617722db27a00f4e..6973853de390daa8baf5bf0b25266a7c7ad4cdfe 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_image_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc
|
| @@ -20,7 +20,7 @@
|
| #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"
|
| @@ -64,9 +64,9 @@ UserImageScreen* UserImageScreen::Get(ScreenManager* manager) {
|
| 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),
|
| @@ -358,7 +358,7 @@ void UserImageScreen::ExitScreen() {
|
| 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
|
|
|