chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc - Issue 213623005: CameraPresenceNotifier observers removal supported.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc ('K') | « 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') | 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..54d077e9c7f3d655334b1c73b0e534d473d42657 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

@@ -48,7 +48,6 @@ UserImageScreenHandler::UserImageScreenHandler()

UserImageScreenHandler::~UserImageScreenHandler() {

if (screen_) {

- CameraPresenceNotifier::GetInstance()->RemoveObserver(screen_);

ygorshenin1 2014/04/03 11:45:49 Please, leave the call to RemoveObserver().

screen_->OnActorDestroyed(this);

}

@@ -82,7 +81,8 @@ void UserImageScreenHandler::Show() {

}

void UserImageScreenHandler::Hide() {

- CameraPresenceNotifier::GetInstance()->RemoveObserver(screen_);

+ if (screen_)

ygorshenin1 2014/04/03 11:45:49 It's OK to remove NULL from observer list.

+ CameraPresenceNotifier::GetInstance()->RemoveObserver(screen_);

}

void UserImageScreenHandler::PrepareToShow() {