diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 09:22:51 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-13 09:22:51 +0000 |
| commit | f96554842a428f56f6d940aa79e1760c0178f50e (patch) | |
| tree | 4d4b50daa772e95e0466d05462f244aba365d9c3 /chrome/browser/extensions/api/extension_action | |
| parent | 373c511f6d727194e87f90d3613dd458d583fa25 (diff) | |
| download | chromium_src-f96554842a428f56f6d940aa79e1760c0178f50e.zip chromium_src-f96554842a428f56f6d940aa79e1760c0178f50e.tar.gz chromium_src-f96554842a428f56f6d940aa79e1760c0178f50e.tar.bz2 | |
Move page action manifest parsing out of Extension; the first multi-key manifest handler.
Clean up some manifest unit tests.
BUG=159265
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12042096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/extension_action')
| -rw-r--r-- | chrome/browser/extensions/api/extension_action/extension_action_api.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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 b536ed7..63e7752 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -25,6 +25,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/api/extension_action/browser_action_handler.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" @@ -190,6 +191,11 @@ static base::LazyInstance<ProfileKeyedAPIFactory<ExtensionActionAPI> > ExtensionActionAPI::ExtensionActionAPI(Profile* profile) { ManifestHandler::Register(extension_manifest_keys::kBrowserAction, make_linked_ptr(new BrowserActionHandler)); + linked_ptr<PageActionHandler> page_action_handler(new PageActionHandler); + ManifestHandler::Register( + extension_manifest_keys::kPageAction, page_action_handler); + ManifestHandler::Register( + extension_manifest_keys::kPageActions, page_action_handler); ManifestHandler::Register(extension_manifest_keys::kScriptBadge, make_linked_ptr(new ScriptBadgeHandler)); |