chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc - Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset

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 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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/network_dropdown.cc ('k') | chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc » ('j') | 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 411d330194469cc2a7886f7d6a870eb960dc3cf7..50ca318a8caa0aeb0e1bcddc15bb324f09c104c5 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

@@ -268,7 +268,7 @@ void UserImageScreenHandler::HandleImageAccepted(const base::ListValue* args) {

switch (selected_image_) {

case User::kExternalImageIndex:

// Photo decoding may not have been finished yet.

- if (user_photo_.empty())

+ if (user_photo_.isNull())

accept_photo_after_decoding_ = true;

else

screen_->OnPhotoTaken(user_photo_);