Make IsTriggerableEvent take Event objects and use it to verify whether tap events should trigger.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 145 matching lines @@
 
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE {
     gfx::Point location(p);
     ConvertPointToScreen(this, &location);
     *tooltip = BookmarkBarView::CreateToolTipForURLAndTitle(location, url_,
                                                             text(), profile_);
     return !tooltip->empty();
   }
 
-  virtual bool IsTriggerableEvent(const views::MouseEvent& e) OVERRIDE {
-    return event_utils::IsPossibleDispositionEvent(e);
+  virtual bool IsTriggerableEvent(const views::Event& e) OVERRIDE {
+    return e.type() == ui::ET_GESTURE_TAP ||
+           e.type() == ui::ET_GESTURE_TAP_DOWN ||
+           event_utils::IsPossibleDispositionEvent(e);
   }
 
   virtual std::string GetClassName() const OVERRIDE {
     return kViewClassName;
   }
 
  private:
   const GURL& url_;
   Profile* profile_;
   scoped_ptr<ui::SlideAnimation> show_animation_;
@@ skipping 26 matching lines @@
     }
   }
 
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE {
     if (text_size_.width() > GetTextBounds().width())
       *tooltip = text_;
     return !tooltip->empty();
   }
 
-  virtual bool IsTriggerableEvent(const views::MouseEvent& e) OVERRIDE {
-    // Left clicks should show the menu contents and right clicks should show
-    // the context menu. They should not trigger the opening of underlying urls.
-    if (e.flags() == ui::EF_LEFT_MOUSE_BUTTON ||
-        e.flags() == ui::EF_RIGHT_MOUSE_BUTTON)
+  virtual bool IsTriggerableEvent(const views::Event& e) OVERRIDE {
+    // Left clicks and taps should show the menu contents and right clicks
+    // should show the context menu. They should not trigger the opening of
+    // underlying urls.
+    if (e.type() == ui::ET_GESTURE_TAP ||
+        (e.IsMouseEvent() && (e.flags() &
+             (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON))))
       return false;
 
-    return browser::DispositionFromEventFlags(e.flags()) != CURRENT_TAB;
+    if (e.IsMouseEvent())
+      return browser::DispositionFromEventFlags(e.flags()) != CURRENT_TAB;
+    return false;
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) {
     views::MenuButton::PaintButton(canvas, views::MenuButton::PB_NORMAL);
   }
 
  private:
   scoped_ptr<ui::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
@@ skipping 1437 matching lines @@
               (1 - size_animation_->GetCurrentValue())));
     } else {
       prefsize.set_height(
           static_cast<int>(
               browser_defaults::kBookmarkBarHeight *
               size_animation_->GetCurrentValue()));
     }
   }
   return prefsize;
 }