MenuButtons enter Hover state upon Tap Down

ui/views/controls/button/menu_button_unittest.cc

 // Copyright 2014 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/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/test/views_test_base.h"
 
 #if defined(USE_AURA)
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/wm/public/drag_drop_client.h"
 #endif
 
 using base::ASCIIToUTF16;
 
 namespace views {
 
 class MenuButtonTest : public ViewsTestBase {
  public:
   MenuButtonTest() : widget_(nullptr), button_(nullptr) {}
   virtual ~MenuButtonTest() {}
 
+  void SetUp() override {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kEnableTouchFeedback);
+    ViewsTestBase::SetUp();
+  }
+
   void TearDown() override {
     if (widget_ && !widget_->IsClosed())
       widget_->Close();
 
     ViewsTestBase::TearDown();
   }
 
   Widget* widget() { return widget_; }
   MenuButton* button() { return button_; }
 
@@ skipping 343 matching lines @@
   button()->PrependPreTargetHandler(&drag_client);
 
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
   generator.set_current_location(gfx::Point(10, 10));
   generator.DragMouseBy(10, 0);
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
   EXPECT_EQ(Button::STATE_NORMAL, menu_button_listener.last_source_state());
 }
 #endif
 
+// Tests that the button enters a hovered state upon a tap down, before becoming
+// pressed at activation.
+TEST_F(MenuButtonTest, TouchFeedbackDuringTap) {
+  TestMenuButtonListener menu_button_listener;
+  CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
+  ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
+  generator.set_current_location(gfx::Point(10, 10));
+  generator.PressTouch();
+  EXPECT_EQ(Button::STATE_HOVERED, button()->state());
+
+  generator.ReleaseTouch();
+  EXPECT_EQ(Button::STATE_PRESSED, menu_button_listener.last_source_state());
+}
+
+// Tests that a move event that exits the button returns it to the normal state,
+// and that the button did not activate the listener.
+TEST_F(MenuButtonTest, TouchFeedbackDuringTapCancel) {
+  TestMenuButtonListener menu_button_listener;
+  CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
+  ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
+  generator.set_current_location(gfx::Point(10, 10));
+  generator.PressTouch();
+  EXPECT_EQ(Button::STATE_HOVERED, button()->state());
+
+  generator.MoveTouch(gfx::Point(10, 30));
+  generator.ReleaseTouch();
+  EXPECT_EQ(Button::STATE_NORMAL, button()->state());
+  EXPECT_EQ(nullptr, menu_button_listener.last_source());
+}
+
 }  // namespace views