chrome/browser/extensions/extension_action_storage_manager.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_storage_manager.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_unittest.cc ('k') | extensions/browser/extension_icon_image.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_storage_manager.cc

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

index 69e0946e738ea059931ac0248b5acf9279371273..a7de1e6a51eb3674fdcc7152105db9fc9d63b7fc 100644

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

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

@@ -169,7 +169,8 @@ scoped_ptr<base::DictionaryValue> DefaultsToValue(ExtensionAction* action) {

dict->SetInteger(kAppearanceStorageKey,

action->GetIsVisible(kDefaultTabId) ? ACTIVE : INVISIBLE);

- gfx::ImageSkia icon = action->GetExplicitlySetIcon(kDefaultTabId);

+ gfx::ImageSkia icon =

+ action->GetExplicitlySetIcon(kDefaultTabId).AsImageSkia();

if (!icon.isNull()) {

scoped_ptr<base::DictionaryValue> icon_value(new base::DictionaryValue());

for (size_t i = 0; i < extension_misc::kNumExtensionActionIconSizes; i++) {

« no previous file with comments | « chrome/browser/extensions/extension_action_icon_factory_unittest.cc ('k') | extensions/browser/extension_icon_image.h » ('j') | no next file with comments »