ui/views/controls/button/text_button.h - 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: ui/views/controls/button/text_button.h

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: ui/views/controls/button/text_button.h

diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h

index 9b59da302c2c9df9a3c5c11559f278605faab339..99feea600be6cbe837583bb2b5144bc9f16ae8e7 100644

--- a/ui/views/controls/button/text_button.h

+++ b/ui/views/controls/button/text_button.h

@@ -323,7 +323,7 @@ class VIEWS_EXPORT TextButton : public TextButtonBase {

virtual void SetHoverIcon(const gfx::ImageSkia& icon);

virtual void SetPushedIcon(const gfx::ImageSkia& icon);

- bool HasIcon() const { return !icon_.empty(); }

+ bool HasIcon() const { return !icon_.isNull(); }

// Meanings are reversed for right-to-left layouts.

enum IconPlacement {

« no previous file with comments | « ui/views/controls/button/image_button_unittest.cc ('k') | ui/views/controls/image_view.cc » ('j') | no next file with comments »