chrome/common/extensions/api/extension_action/action_info.cc - Issue 502033003: Move ExtensionActionStorageManager out of extension_action_api.*

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/api/extension_action/action_info.cc

Issue 502033003: Move ExtensionActionStorageManager out of extension_action_api.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master for CQ Created 6 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/common/extensions/api/extension_action/action_info.cc

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

index f974c1d0bc0bc179590b3eaa7e2397985e6a94fa..1068dacea09291cc48ce71871b9d0f06a7e53e22 100644

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

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

@@ -91,9 +91,12 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,

const base::DictionaryValue* icons_value = NULL;

std::string default_icon;

if (dict->GetDictionary(keys::kPageActionDefaultIcon, &icons_value)) {

+ int icon_sizes[extension_misc::kNumExtensionActionIconSizes];

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

+ icon_sizes[i] = extension_misc::kExtensionActionIconSizes[i].size;

if (!manifest_handler_helpers::LoadIconsFromDictionary(

icons_value,

- extension_misc::kExtensionActionIconSizes,

+ icon_sizes,

extension_misc::kNumExtensionActionIconSizes,

&result->default_icon,

error)) {

« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | extensions/common/constants.h » ('j') | no next file with comments »