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

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_node_data.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 26 matching lines @@
 const int MenuButton::kMenuMarkerPaddingLeft = 3;
 const int MenuButton::kMenuMarkerPaddingRight = -1;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton::PressedLock
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 MenuButton::PressedLock::PressedLock(MenuButton* menu_button)
-    : PressedLock(menu_button, false) {}
+    : PressedLock(menu_button, false, nullptr) {}
 
 MenuButton::PressedLock::PressedLock(MenuButton* menu_button,
-                                     bool is_sibling_menu_show)
+                                     bool is_sibling_menu_show,
+                                     const ui::LocatedEvent* event)
     : menu_button_(menu_button->weak_factory_.GetWeakPtr()) {
-  menu_button_->IncrementPressedLocked(is_sibling_menu_show);
+  menu_button_->IncrementPressedLocked(is_sibling_menu_show, event);
 }
 
 MenuButton::PressedLock::~PressedLock() {
   if (menu_button_.get())
     menu_button_->DecrementPressedLocked();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - constructors, destructors, initialization
@@ skipping 296 matching lines @@
     LabelButton::StateChanged(old_state);
   }
 }
 
 void MenuButton::NotifyClick(const ui::Event& event) {
   // We don't forward events to the normal button listener, instead using the
   // MenuButtonListener.
   Activate(&event);
 }
 
-void MenuButton::IncrementPressedLocked(bool snap_ink_drop_to_activated) {
+void MenuButton::IncrementPressedLocked(bool snap_ink_drop_to_activated,
+                                        const ui::LocatedEvent* event) {
   ++pressed_lock_count_;
   if (increment_pressed_lock_called_)
     *increment_pressed_lock_called_ = true;
   should_disable_after_press_ = state() == STATE_DISABLED;
   if (state() != STATE_PRESSED) {
     if (snap_ink_drop_to_activated)
       GetInkDrop()->SnapToActivated();
     else
-      AnimateInkDrop(InkDropState::ACTIVATED, nullptr /* event */);
+      AnimateInkDrop(InkDropState::ACTIVATED, event);
   }
   SetState(STATE_PRESSED);
 }
 
 void MenuButton::DecrementPressedLocked() {
   --pressed_lock_count_;
   DCHECK_GE(pressed_lock_count_, 0);
 
   // If this was the last lock, manually reset state to the desired state.
   if (pressed_lock_count_ == 0) {
@@ skipping 17 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views