chrome/renderer/chrome_content_renderer_client.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/chrome_content_renderer_client.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/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc ('k') | chrome/renderer/extensions/page_actions_custom_bindings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index d6594fef0510a6d168eb615003660bb28a9a2e70..2b18bab8ab19a59a3c022274e059faec83fccfad 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

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

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/content_settings_pattern.h"

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

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

@@ -129,6 +130,8 @@ void RegisterExtensionManifestHandlers() {

extensions::ManifestHandler::Register(

extension_manifest_keys::kWebAccessibleResources,

new extensions::WebAccessibleResourcesHandler);

+ extensions::ManifestMultiKeyHandler::Register(

+ new extensions::PageActionHandler);

}

static void AppendParams(const std::vector<string16>& additional_names,