Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8205)

Unified Diff: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

Issue 213623005: CameraPresenceNotifier observers removal supported. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Logic moved to screens. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index bb048c58e3542a263a3486f53ebc506a6125d2f8..3a9b9eb32569e9311eb7fdd96fbec21716f90985 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -9,7 +9,6 @@
#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"
@@ -48,7 +47,6 @@ UserImageScreenHandler::UserImageScreenHandler()
UserImageScreenHandler::~UserImageScreenHandler() {
if (screen_) {
- CameraPresenceNotifier::GetInstance()->RemoveObserver(screen_);
screen_->OnActorDestroyed(this);
}
}
@@ -76,13 +74,11 @@ void UserImageScreenHandler::Show() {
// 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() {
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698