chrome/common/extensions/extension_action.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/common/extensions/extension_action.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: chrome/common/extensions/extension_action.cc

diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc

index b2bef14906d110b257e207c05b482a0562204557..ef8759dfb6d31949deed0a20ca9f2e2c5bf0db5b 100644

--- a/chrome/common/extensions/extension_action.cc

+++ b/chrome/common/extensions/extension_action.cc

@@ -305,7 +305,7 @@ void ExtensionAction::SetIcon(int tab_id, const gfx::Image& image) {

gfx::Image ExtensionAction::GetIcon(int tab_id) const {

// Check if a specific icon is set for this tab.

gfx::ImageSkia icon = GetValue(&icon_, tab_id);

- if (icon.empty()) {

+ if (icon.isNull()) {

// Need to find an icon from a path.

const std::string* path = NULL;

// Check if one of the elements of icon_path() was selected.