CameraPresenceNotifier observers removal supported.

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/default_user_images.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_image_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 39 matching lines @@
       is_screen_ready_(false),
       user_has_selected_image_(false) {
   actor_->SetDelegate(this);
   SetProfilePictureEnabled(true);
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                               content::NotificationService::AllSources());
 }
 
 UserImageScreen::~UserImageScreen() {
+  CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (actor_)
     actor_->SetDelegate(NULL);
   if (image_decoder_.get())
     image_decoder_->set_delegate(NULL);
 }
 
 void UserImageScreen::OnScreenReady() {
   is_screen_ready_ = true;
   if (!IsWaitingForSync())
     HideCurtain();
@@ skipping 209 matching lines @@
       }
       sync_observer->AddObserver(this);
       sync_timer_.reset(new base::Timer(
             FROM_HERE,
             base::TimeDelta::FromSeconds(kSyncTimeoutSeconds),
             base::Bind(&UserImageScreen::OnSyncTimeout, base::Unretained(this)),
             false));
       sync_timer_->Reset();
     }
   }
+  CameraPresenceNotifier::GetInstance()->AddObserver(this);
   actor_->Show();
   actor_->SetProfilePictureEnabled(profile_picture_enabled_);
 
   selected_image_ = GetUser()->image_index();
   actor_->SelectImage(selected_image_);
 
   if (profile_picture_enabled_) {
     // Start fetching the profile image.
     GetUserImageManager()->DownloadProfileImage(kProfileDownloadReason);
   }
 }
 
 void UserImageScreen::Hide() {
+  CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (actor_)
     actor_->Hide();
 }
 
 std::string UserImageScreen::GetName() const {
   return WizardController::kUserImageScreenName;
 }
 
 void UserImageScreen::OnActorDestroyed(UserImageScreenActor* actor) {
   if (actor_ == actor)
@@ skipping 44 matching lines @@
 
 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);
 }
 
 }  // namespace chromeos