ash/launcher/launcher_button.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: ash/launcher/launcher_button.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:

Index: ash/launcher/launcher_button.cc

diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc

index b550d56db4cf73964c701957bccf2e92ca1c30ae..7cb82d8d7e8c725e5b05b5b6b9338e78dc5e2c22 100644

--- a/ash/launcher/launcher_button.cc

+++ b/ash/launcher/launcher_button.cc

@@ -247,7 +247,7 @@ void LauncherButton::SetShadowedImage(const gfx::ImageSkia& image) {

}

void LauncherButton::SetImage(const gfx::ImageSkia& image) {

- if (image.empty()) {

+ if (image.isNull()) {

// TODO: need an empty image.

icon_view_->SetImage(image);

return;