chrome/browser/extensions/extension_action_icon_factory.cc - Issue 882243002: [Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

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/extensions/extension_action_icon_factory.cc

Issue 882243002: [Extensions] Make extension actions use gfx::Image over gfx::ImageSkia. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 5 years, 11 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/extensions/extension_action_icon_factory.h ('k') | chrome/browser/extensions/extension_action_icon_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_icon_factory.cc

diff --git a/chrome/browser/extensions/extension_action_icon_factory.cc b/chrome/browser/extensions/extension_action_icon_factory.cc

index 6c5461f2262fd778324a874ca36bf3bf9b48c7e2..a7e8df3043b89b0c226df33c89ce1830a5b539f4 100644

--- a/chrome/browser/extensions/extension_action_icon_factory.cc

+++ b/chrome/browser/extensions/extension_action_icon_factory.cc

@@ -41,16 +41,12 @@ void ExtensionActionIconFactory::OnExtensionIconImageDestroyed(

}

gfx::Image ExtensionActionIconFactory::GetIcon(int tab_id) {

- return gfx::Image(GetBaseIconFromAction(tab_id));

-gfx::ImageSkia ExtensionActionIconFactory::GetBaseIconFromAction(int tab_id) {

- gfx::ImageSkia icon = action_->GetExplicitlySetIcon(tab_id);

- if (!icon.isNull())

+ gfx::Image icon = action_->GetExplicitlySetIcon(tab_id);

+ if (!icon.IsEmpty())

return icon;

icon = action_->GetDeclarativeIcon(tab_id);

- if (!icon.isNull())

+ if (!icon.IsEmpty())

return icon;

return action_->GetDefaultIconImage();