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

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

Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed CustomButton::set_ink_drop_action_on_click() method. Created 5 years 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
« no previous file with comments | « ui/views/controls/button/custom_button.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 46eaca426033c2d0cea3366749b3f2b8dd582d76..32cfd9c2a23818452c0c9cb98327352e39696b42 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -182,6 +182,8 @@ bool MenuButton::OnMousePressed(const ui::MouseEvent& event) {
TimeDelta delta = TimeTicks::Now() - menu_closed_time_;
if (delta.InMilliseconds() > kMinimumMsBetweenButtonClicks)
return Activate();
+ if (ink_drop_delegate())
+ ink_drop_delegate()->OnAction(InkDropState::ACTION_PENDING);
}
return true;
}
« no previous file with comments | « ui/views/controls/button/custom_button.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698