MenuButtons enter Hover state upon Tap Down

ui/views/controls/button/menu_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/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
@@ skipping 176 matching lines @@
   if (pressed_lock_count_ == 0)  // Ignore mouse movement if state is locked.
     LabelButton::OnMouseExited(event);
 }
 
 void MenuButton::OnMouseMoved(const ui::MouseEvent& event) {
   if (pressed_lock_count_ == 0)  // Ignore mouse movement if state is locked.
     LabelButton::OnMouseMoved(event);
 }
 
 void MenuButton::OnGestureEvent(ui::GestureEvent* event) {
-  if (state() != STATE_DISABLED && ShouldEnterPushedState(*event) &&
-      !Activate()) {
-    // When |Activate()| returns |false|, it means that a menu is shown and
-    // has handled the gesture event. So, there is no need to further process
-    // the gesture event here.
-    return;
+  if (state() != STATE_DISABLED) {
+    if (switches::IsTouchFeedbackEnabled()) {

[flackr, 2014/10/27 17:51:27]

Should this be done after line 220 so that the menu gets first crack at handling
the event?

[jonross, 2014/10/27 18:51:39]

Good call, that way any classes extending get the first shot.

Done.

+      if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
+        event->SetHandled();

[flackr, 2014/10/27 17:51:27]

This doesn't prevent context menu generation, does it?

[jonross, 2014/10/27 18:51:39]

No it does not, it just keeps this view as the event target for future events,
including ones that go out of bounds. Allows it to receive the cancel/end on
moves out of the view. Show Press still causes the context menu to execute.

+        SetState(Button::STATE_HOVERED);
+      } else if (state() == Button::STATE_HOVERED &&
+                 (event->type() == ui::ET_GESTURE_TAP_CANCEL ||
+                  event->type() == ui::ET_GESTURE_END)) {
+        SetState(Button::STATE_NORMAL);
+      }
+    }
+    if (ShouldEnterPushedState(*event) && !Activate()) {
+      // When |Activate()| returns |false|, it means that a menu is shown and
+      // has handled the gesture event. So, there is no need to further process
+      // the gesture event here.
+      return;
+    }
   }
   LabelButton::OnGestureEvent(event);
 }
 
 bool MenuButton::OnKeyPressed(const ui::KeyEvent& event) {
   switch (event.key_code()) {
     case ui::VKEY_SPACE:
       // Alt-space on windows should show the window menu.
       if (event.IsAltDown())
         break;
@@ skipping 94 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views