Allow a LocatedEvent to be passed to MenuButton, so the ink drop animation is centered on the click…

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 <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 322 matching lines @@
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
 
   generator()->ClickLeftButton();
 
   // Check that MenuButton has notified the listener, while it was in pressed
   // state.
   EXPECT_EQ(button(), menu_button_listener.last_source());
   EXPECT_EQ(Button::STATE_HOVERED, menu_button_listener.last_source_state());
 }
 
+// Tests that the ink drop center point is set from the mouse click point.
+TEST_F(MenuButtonTest, InkDropCenterSetFromClick) {
+  TestMenuButtonListener menu_button_listener;
+  CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
+
+  auto click_point = gfx::Point(6, 8);

[sky, 2017/04/24 15:07:13]

IMO auto here is overkill:

gfx::Point click_point(6, 8) is shorter. Same comment on 363 and 364 below.

[emx, 2017/04/24 16:32:07]

Oh, yes, of course. :)

+  generator()->MoveMouseTo(click_point);
+  generator()->ClickLeftButton();
+
+  EXPECT_EQ(button(), menu_button_listener.last_source());
+  EXPECT_EQ(
+      click_point,
+      InkDropHostViewTestApi(button()).GetInkDropCenterBasedOnLastEvent());
+}
+
+// Tests that the ink drop center point is set from the PressedLock constructor.
+TEST_F(MenuButtonTest, InkDropCenterSetFromClickWithPressedLock) {
+  TestMenuButtonListener menu_button_listener;
+  CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
+
+  auto click_point = gfx::Point(11, 7);
+  auto click_event =
+      ui::MouseEvent(ui::EventType::ET_MOUSE_PRESSED, click_point, click_point,
+                     base::TimeTicks(), 0, 0);
+  std::unique_ptr<MenuButton::PressedLock> pressed_lock(

[sky, 2017/04/24 15:07:13]

There is no need for the unique_ptr here. Declared pressed_lock on the stack.

[emx, 2017/04/24 16:32:07]

Done.

+      new MenuButton::PressedLock(button(), false, &click_event));
+
+  EXPECT_EQ(Button::STATE_PRESSED, button()->state());
+  EXPECT_EQ(
+      click_point,
+      InkDropHostViewTestApi(button()).GetInkDropCenterBasedOnLastEvent());
+}
+
 // Test that the MenuButton stays pressed while there are any PressedLocks.
 TEST_F(MenuButtonTest, ButtonStateForMenuButtonsWithPressedLocks) {
   // Similarly for aura-mus-client the location of the cursor is not updated by
   // EventGenerator so that IsMouseHovered() checks the wrong thing.
   // https://crbug.com/615033.
   if (IsMus())
     return;
 
   CreateMenuButtonWithNoListener();
 
@@ skipping 255 matching lines @@
 
   generator()->MoveTouch(gfx::Point(10, 30));
   generator()->ReleaseTouch();
   EXPECT_EQ(Button::STATE_NORMAL, button()->state());
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
 }
 
 #endif  // !defined(OS_MACOSX) || defined(USE_AURA)
 
 }  // namespace views