chrome/browser/extensions/api/extension_action/extension_action_api.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/browser/extensions/api/extension_action/extension_action_api.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

« no previous file with comments | « no previous file | chrome/browser/extensions/extension_action_manager.cc » ('j') | chrome/common/extensions/api/extension_action/page_action_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

index f3cab931266d4dde64e08bdcadf9352009cec9fa..29ed6321b8bcc1203d5e6283abd1221c701a207e 100644

--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_notification_types.h"

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

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

#include "chrome/common/extensions/api/extension_action/script_badge_handler.h"

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

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

@@ -186,6 +187,7 @@ static base::LazyInstance<ProfileKeyedAPIFactory<ExtensionActionAPI> >

g_factory = LAZY_INSTANCE_INITIALIZER;

ExtensionActionAPI::ExtensionActionAPI(Profile* profile) {

+ ManifestMultiKeyHandler::Register(new PageActionHandler);

ManifestHandler::Register(extension_manifest_keys::kScriptBadge,

new ScriptBadgeHandler);

ExtensionFunctionRegistry* registry =