diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-19 03:51:10 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-19 03:51:10 +0000 |
| commit | 4f88601f6c623ae2688cd5610b265d22fd6cf6e9 (patch) | |
| tree | 14d84b98b78e11dcfffd5f2b46c54537e2dcb20e /chrome/browser/extensions/page_action_controller.cc | |
| parent | 57e61ee724299d113dde25e93e3ed5fdd0b65a25 (diff) | |
| download | chromium_src-4f88601f6c623ae2688cd5610b265d22fd6cf6e9.zip chromium_src-4f88601f6c623ae2688cd5610b265d22fd6cf6e9.tar.gz chromium_src-4f88601f6c623ae2688cd5610b265d22fd6cf6e9.tar.bz2 | |
Make the page action space show extensions with active content scripts or
executed script when the action box is enabled.
This is platform independent but will only work on GTK until cocoa and views
have been updated to use the ActionBoxController interface.
BUG=127988
Review URL: https://chromiumcodereview.appspot.com/10332235
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/page_action_controller.cc')
| -rw-r--r-- | chrome/browser/extensions/page_action_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc index ed3c8e6..a8381e4 100644 --- a/chrome/browser/extensions/page_action_controller.cc +++ b/chrome/browser/extensions/page_action_controller.cc @@ -53,8 +53,8 @@ ActionBoxController::Action PageActionController::OnClicked( int tab_id = ExtensionTabUtil::GetTabId(tab_contents_->web_contents()); switch (mouse_button) { - case 1: - case 2: + case 1: // left + case 2: // middle if (page_action->HasPopup(tab_id)) return ACTION_SHOW_POPUP; @@ -67,7 +67,7 @@ ActionBoxController::Action PageActionController::OnClicked( mouse_button); return ACTION_NONE; - case 3: + case 3: // right return extension->ShowConfigureContextMenus() ? ACTION_SHOW_CONTEXT_MENU : ACTION_NONE; } |