chrome/renderer/extensions/page_actions_custom_bindings.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/renderer/extensions/page_actions_custom_bindings.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, 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

« chrome/common/extensions/manifest_handler.h ('K') | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/page_actions_custom_bindings.cc

diff --git a/chrome/renderer/extensions/page_actions_custom_bindings.cc b/chrome/renderer/extensions/page_actions_custom_bindings.cc

index 5f1735e44a084ed588b01a55ff3df82a516a0f33..ab3cede528a863b212e6e6354623566a843d62d4 100644

--- a/chrome/renderer/extensions/page_actions_custom_bindings.cc

+++ b/chrome/renderer/extensions/page_actions_custom_bindings.cc

@@ -6,6 +6,7 @@

#include <string>

+#include "chrome/common/extensions/api/extension_action/action_info.h"

#include "chrome/renderer/extensions/dispatcher.h"

#include "grit/renderer_resources.h"

#include "v8/include/v8.h"

@@ -30,8 +31,8 @@ v8::Handle<v8::Value> PageActionsCustomBindings::GetCurrentPageActions(

CHECK(extension);

v8::Local<v8::Array> page_action_vector = v8::Array::New();

- if (extension->page_action_info()) {

- std::string id = extension->page_action_info()->id;

+ if (ActionInfo::GetPageActionInfo(extension)) {

+ std::string id = ActionInfo::GetPageActionInfo(extension)->id;

page_action_vector->Set(v8::Integer::New(0),

v8::String::New(id.c_str(), id.size()));

}