Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: ui/views/controls/button/menu_button.cc

Issue 2832823002: Update avatar button to MD (Closed)
Patch Set: Fixed bad merge that duplicated the GetMinimizeButtonHeight() method in some files Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698