chrome/common/extensions/extension_file_util.cc - Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler.

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_file_util.cc

Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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/extension_file_util.cc

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

index bbe970b1ec87c99407335d908563cacc1e3cc30e..d0c422f3deaec3702fc6b0b81483faeff152b1a2 100644

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

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

@@ -340,7 +340,8 @@ bool ValidateExtension(const Extension* extension,

}

- const extensions::ActionInfo* action = extension->page_action_info();

+ const extensions::ActionInfo* action =

+ extensions::ActionInfo::GetPageActionInfo(extension);

if (action && !action->default_icon.empty() &&

!ValidateExtensionIconSet(action->default_icon, extension,

IDS_EXTENSION_LOAD_ICON_FOR_PAGE_ACTION_FAILED, error)) {

« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/common/extensions/extension_file_util_unittest.cc » ('j') | no next file with comments »