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

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

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.h
diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h
index b0ddf33115211df9b758287c852394687f50e738..0d87c31f41434314d65383ebede56e6a39099632 100644
--- a/ui/views/controls/button/menu_button.h
+++ b/ui/views/controls/button/menu_button.h
@@ -32,7 +32,10 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
class VIEWS_EXPORT PressedLock {
public:
explicit PressedLock(MenuButton* menu_button);
- PressedLock(MenuButton* menu_button, bool is_sibling_menu_show);
+ // |event| is the event that caused the button to be pressed. May be null.
+ PressedLock(MenuButton* menu_button,
+ bool is_sibling_menu_show,
+ const ui::LocatedEvent* event);
~PressedLock();
private:
@@ -108,8 +111,10 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
// Increment/decrement the number of "pressed" locks this button has, and
// set the state accordingly. The ink drop is snapped to the final ACTIVATED
// state if |snap_ink_drop_to_activated| is true, otherwise the ink drop will
- // be animated to the ACTIVATED node_data.
- void IncrementPressedLocked(bool snap_ink_drop_to_activated);
+ // be animated to the ACTIVATED node_data. The ink drop is animated at the
+ // location of |event| if non-null, otherwise at the default location.
+ void IncrementPressedLocked(bool snap_ink_drop_to_activated,
+ const ui::LocatedEvent* event);
void DecrementPressedLocked();
// Compute the maximum X coordinate for the current screen. MenuButtons

Powered by Google App Engine
This is Rietveld 408576698