Redirect behaviour of gesture events on browser action buttons appropriately.

BUG=151364
TEST=Install Speedtracer, tap icon in toolbar. Speedtracer window opens up.


Review URL: https://chromiumcodereview.appspot.com/11365046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166012 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc
index 0fb725a..3e96b40 100644
--- a/chrome/browser/ui/views/browser_action_view.cc
+++ b/chrome/browser/ui/views/browser_action_view.cc
@@ -312,8 +312,8 @@ bool BrowserActionButton::Activate() {
 
 bool BrowserActionButton::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsRightMouseButton()) {
-    return IsPopup() ? MenuButton::OnMousePressed(event)
-                     : TextButton::OnMousePressed(event);
+    return IsPopup() ? MenuButton::OnMousePressed(event) :
+                       TextButton::OnMousePressed(event);
   }
 
   // See comments in MenuButton::Activate() as to why this is needed.
@@ -341,8 +341,13 @@ void BrowserActionButton::OnMouseExited(const ui::MouseEvent& event) {
 }
 
 bool BrowserActionButton::OnKeyReleased(const ui::KeyEvent& event) {
-  return IsPopup() ? MenuButton::OnKeyReleased(event)
-                   : TextButton::OnKeyReleased(event);
+  return IsPopup() ? MenuButton::OnKeyReleased(event) :
+                     TextButton::OnKeyReleased(event);
+}
+
+ui::EventResult BrowserActionButton::OnGestureEvent(ui::GestureEvent* event) {
+  return IsPopup() ? MenuButton::OnGestureEvent(event) :
+                     TextButton::OnGestureEvent(event);
 }
 
 bool BrowserActionButton::AcceleratorPressed(
diff --git a/chrome/browser/ui/views/browser_action_view.h b/chrome/browser/ui/views/browser_action_view.h
index 3d6bcd5..c1a175b 100644
--- a/chrome/browser/ui/views/browser_action_view.h
+++ b/chrome/browser/ui/views/browser_action_view.h
@@ -158,6 +158,7 @@ class BrowserActionButton : public views::MenuButton,
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from ui::AcceleratorTarget.
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;