| 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 014ae5b6626aaa977576642632f54dd1d237dd88..18a863c7193a68ada1decaa17d187b93b2cf2a5d 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_image_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc
|
| @@ -17,6 +17,7 @@
|
| #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/default_user_images.h"
|
| #include "chrome/browser/chromeos/login/login_utils.h"
|
| #include "chrome/browser/chromeos/login/screens/screen_observer.h"
|
| @@ -76,6 +77,7 @@ UserImageScreen::UserImageScreen(ScreenObserver* screen_observer,
|
| }
|
|
|
| UserImageScreen::~UserImageScreen() {
|
| + CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
|
| if (actor_)
|
| actor_->SetDelegate(NULL);
|
| if (image_decoder_.get())
|
| @@ -305,6 +307,7 @@ void UserImageScreen::Show() {
|
| sync_timer_->Reset();
|
| }
|
| }
|
| + CameraPresenceNotifier::GetInstance()->AddObserver(this);
|
| actor_->Show();
|
| actor_->SetProfilePictureEnabled(profile_picture_enabled_);
|
|
|
| @@ -318,6 +321,7 @@ void UserImageScreen::Show() {
|
| }
|
|
|
| void UserImageScreen::Hide() {
|
| + CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
|
| if (actor_)
|
| actor_->Hide();
|
| }
|
|
|