Do not handle ui::ET_GESTURE_END events in CustomButton

ui/views/controls/button/custom_button.cc

Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 1b5d1e82ffbd705b332ed9ce3057a60a8d2da995..b1cf301ac914c3851ede77ff51c06336d50ecb3a 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -228,22 +228,21 @@ void CustomButton::OnGestureEvent(ui::GestureEvent* event) {
   }
 
   if (event->type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(*event)) {
-    // Set the button state to hot and start the animation fully faded in. The
-    // GESTURE_END event issued immediately after will set the state to
-    // STATE_NORMAL beginning the fade out animation. See
-    // http://crbug.com/131184.
+    // In order to provide visual feedback that the user has tapped on
+    // the button, show the hover state fully faded in immediately after
+    // a tap. Setting the state back to normal begins the fade-out animation.
     SetState(STATE_HOVERED);
     hover_animation_->Reset(1.0);
     NotifyClick(*event);
     event->StopPropagation();
+    SetState(STATE_NORMAL);
   } else if (event->type() == ui::ET_GESTURE_TAP_DOWN &&
              ShouldEnterPushedState(*event)) {
     SetState(STATE_PRESSED);
     if (request_focus_on_press_)
       RequestFocus();
     event->StopPropagation();
-  } else if (event->type() == ui::ET_GESTURE_TAP_CANCEL ||
-             event->type() == ui::ET_GESTURE_END) {
+  } else if (event->type() == ui::ET_GESTURE_TAP_CANCEL) {
     SetState(STATE_NORMAL);
   }
   if (!event->handled())