Do not handle ui::ET_GESTURE_END events in CustomButton

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/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
@@ skipping 210 matching lines @@
   return true;
 }
 
 void CustomButton::OnGestureEvent(ui::GestureEvent* event) {
   if (state_ == STATE_DISABLED) {
     Button::OnGestureEvent(event);
     return;
   }
 
   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())
     Button::OnGestureEvent(event);
 }
 
 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
   SetState(STATE_NORMAL);
   /*
   ui::KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
@@ skipping 93 matching lines @@
   if (!details.is_add && state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(STATE_NORMAL);
 }
 
 }  // namespace views