diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 22:23:34 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 22:23:34 +0000 |
| commit | bc4ae15f9d04b20a8f7a6d34daf0091e075ff485 (patch) | |
| tree | 3b006b925d24dc5841ddeefaa0aacab9288fc046 /chrome/browser/extensions/extension_menu_manager.cc | |
| parent | 2f169ca09a854d26f58e7c9697eab52c15f3cdd5 (diff) | |
| download | chromium_src-bc4ae15f9d04b20a8f7a6d34daf0091e075ff485.zip chromium_src-bc4ae15f9d04b20a8f7a6d34daf0091e075ff485.tar.gz chromium_src-bc4ae15f9d04b20a8f7a6d34daf0091e075ff485.tar.bz2 | |
Dispatch a new event chrome.contextMenus.onClicked.
Disallow onclick create parameter for event pages.
Fix onClickData, which had incorrect types and missing fields.
BUG=123366
TEST=Register a chrome.contextMenus.onClicked handler in an event page (adding the menu items upon chrome.runtime.onInstalled). Check that it fires.
Review URL: https://chromiumcodereview.appspot.com/10454106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_menu_manager.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_menu_manager.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index 99d6fc4..d0fb437 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/chrome/browser/extensions/extension_menu_manager.cc @@ -12,6 +12,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/extensions/extension_event_names.h" #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" @@ -603,11 +604,14 @@ void ExtensionMenuManager::ExecuteCommand( std::string json_args; base::JSONWriter::Write(&args, &json_args); - std::string event_name = "contextMenus"; event_router->DispatchEventToExtension( - item->extension_id(), event_name, json_args, profile, GURL(), + item->extension_id(), extension_event_names::kOnContextMenus, + json_args, profile, GURL(), + ExtensionEventRouter::USER_GESTURE_ENABLED); + event_router->DispatchEventToExtension( + item->extension_id(), extension_event_names::kOnContextMenuClicked, + json_args, profile, GURL(), ExtensionEventRouter::USER_GESTURE_ENABLED); - // TODO(yoz): dispatch another event onClicked. } void ExtensionMenuManager::SanitizeRadioList( |