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

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

Issue 1757993004: Added ink drop hover/ripple to menu hosting bookmark buttons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added tests. Created 4 years, 9 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 91504d2e795d1d109ad177732c63946a32c4ca5b..01bbb132a10285b7f08ba3286afc29fa6ec500e2 100644
--- a/ui/views/controls/button/menu_button.h
+++ b/ui/views/controls/button/menu_button.h
@@ -32,6 +32,7 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
class VIEWS_EXPORT PressedLock {
public:
explicit PressedLock(MenuButton* menu_button);
+ PressedLock(MenuButton* menu_button, bool first_menu_show);
sky 2016/03/11 20:41:32 Rather than explicitly supplying the state can you
bruthig 2016/03/11 21:58:20 Naively, I'm not aware of any way for a MenuButton
sky 2016/03/11 23:11:14 MenuController::GetActiveInstance, but you're righ
~PressedLock();
private:
@@ -105,8 +106,10 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
friend class PressedLock;
// Increment/decrement the number of "pressed" locks this button has, and
- // set the state accordingly.
- void IncrementPressedLocked();
+ // set the state accordingly. The ink drop is animated to the ACTIVATED state
+ // if |animate_ink_drop| is true and will be snapped to it's final frame if
+ // false.
+ void IncrementPressedLocked(bool animate_ink_drop);
void DecrementPressedLocked();
// Compute the maximum X coordinate for the current screen. MenuButtons

Powered by Google App Engine
This is Rietveld 408576698