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

ui/views/controls/button/custom_button.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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
@@ skipping 179 matching lines @@
 
   SetState(BS_NORMAL);
   NotifyClick(event);
   return true;
 }
 
 ui::GestureStatus CustomButton::OnGestureEvent(const GestureEvent& event) {
   if (state_ == BS_DISABLED)
     return ui::GESTURE_STATUS_UNKNOWN;
 
-  if (event.type() == ui::ET_GESTURE_TAP) {
+  if (event.type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(event)) {
     // Set the button state to hot and start the animation fully faded in. The
     // TAP_UP event issued immediately after will set the state to BS_NORMAL
     // beginning the fade out animation. See http://crbug.com/131184.
     SetState(BS_HOT);
     hover_animation_->Reset(1.0);
     NotifyClick(event);
     return ui::GESTURE_STATUS_CONSUMED;
-  } else if (event.type() == ui::ET_GESTURE_TAP_DOWN) {
+  } else if (event.type() == ui::ET_GESTURE_TAP_DOWN &&
+             ShouldEnterPushedState(event)) {
     SetState(BS_PUSHED);
     if (request_focus_on_press_)
       RequestFocus();
     return ui::GESTURE_STATUS_CONSUMED;
   } else {
     SetState(BS_NORMAL);
   }
   return Button::OnGestureEvent(event);
 }
 
@@ skipping 56 matching lines @@
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true) {
   hover_animation_.reset(new ui::ThrobAnimation(this));
   hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
 }
 
 void CustomButton::StateChanged() {
 }
 
-bool CustomButton::IsTriggerableEvent(const MouseEvent& event) {
-  return (triggerable_event_flags_ & event.flags()) != 0;
+bool CustomButton::IsTriggerableEvent(const Event& event) {
+  return event.type() == ui::ET_GESTURE_TAP_DOWN ||
+         event.type() == ui::ET_GESTURE_TAP ||
+         (event.IsMouseEvent() &&
+             (triggerable_event_flags_ & event.flags()) != 0);
 }
 
-bool CustomButton::ShouldEnterPushedState(const MouseEvent& event) {
+bool CustomButton::ShouldEnterPushedState(const Event& event) {
   return IsTriggerableEvent(event);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides (protected):
 
 void CustomButton::ViewHierarchyChanged(bool is_add, View *parent,
                                         View *child) {
   if (!is_add && state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
 }
 
 }  // namespace views