CameraPresenceNotifier observers removal supported.

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

 // Copyright (c) 2013 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/ui/webui/chromeos/login/user_image_screen_handler.h"
 
 #include "ash/audio/sounds.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/camera_presence_notifier.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
@@ skipping 18 matching lines @@
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   media::SoundsManager* manager = media::SoundsManager::Get();
   manager->Initialize(SOUND_OBJECT_DELETE,
                       bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV));
   manager->Initialize(SOUND_CAMERA_SNAP,
                       bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV));
 }
 
 UserImageScreenHandler::~UserImageScreenHandler() {
   if (screen_) {
-    CameraPresenceNotifier::GetInstance()->RemoveObserver(screen_);
     screen_->OnActorDestroyed(this);
   }
 }
 
 void UserImageScreenHandler::Initialize() {
   if (show_on_init_) {
     Show();
     show_on_init_ = false;
   }
 }
 
 void UserImageScreenHandler::SetDelegate(
     UserImageScreenActor::Delegate* screen) {
   screen_ = screen;
 }
 
 void UserImageScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
   screen_show_time_ = base::Time::Now();
   ShowScreen(OobeUI::kScreenUserImagePicker, NULL);
 
   // When shown, query camera presence.
   if (!screen_)
     return;
-  CameraPresenceNotifier::GetInstance()->AddObserver(screen_);
   if (is_ready_)
     screen_->OnScreenReady();
 }
 
 void UserImageScreenHandler::Hide() {
-  CameraPresenceNotifier::GetInstance()->RemoveObserver(screen_);
 }
 
 void UserImageScreenHandler::PrepareToShow() {
 }
 
 void UserImageScreenHandler::DeclareLocalizedValues(
     LocalizedValuesBuilder* builder) {
   builder->Add("userImageScreenTitle", IDS_USER_IMAGE_SCREEN_TITLE);
   builder->Add("userImageScreenDescription",
                IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT);
@@ skipping 122 matching lines @@
 
 void UserImageScreenHandler::HideCurtain() {
   CallJS("hideCurtain");
 }
 
 void UserImageScreenHandler::SetProfilePictureEnabled(bool enabled) {
   CallJS("setProfilePictureEnabled", enabled);
 }
 
 }  // namespace chromeos