Index: ui/views/controls/button/menu_button.cc |
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc |
index 173194bedf5cfe9e7a2aff730a620d1b3d84109d..08bdacd86f923fbb31a5bd5972df269a3ed17ee0 100644 |
--- a/ui/views/controls/button/menu_button.cc |
+++ b/ui/views/controls/button/menu_button.cc |
@@ -44,12 +44,13 @@ const int MenuButton::kMenuMarkerPaddingRight = -1; |
//////////////////////////////////////////////////////////////////////////////// |
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() { |
@@ -366,7 +367,8 @@ void MenuButton::NotifyClick(const ui::Event& event) { |
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; |
@@ -375,7 +377,7 @@ void MenuButton::IncrementPressedLocked(bool snap_ink_drop_to_activated) { |
if (snap_ink_drop_to_activated) |
GetInkDrop()->SnapToActivated(); |
else |
- AnimateInkDrop(InkDropState::ACTIVATED, nullptr /* event */); |
+ AnimateInkDrop(InkDropState::ACTIVATED, event); |
} |
SetState(STATE_PRESSED); |
} |