| 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..696a94146f3f9868e01e2eca55a00dfab53f5e8e 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 is_sibling_menu_show);
|
| ~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 snapped to the final ACTIVATED
|
| + // state if |snap_ink_drop_to_activated| is true, otherwise the ink drop will
|
| + // be animated to the ACTIVATED state.
|
| + void IncrementPressedLocked(bool snap_ink_drop_to_activated);
|
| void DecrementPressedLocked();
|
|
|
| // Compute the maximum X coordinate for the current screen. MenuButtons
|
|
|