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

Unified Diff: ui/views/controls/button/custom_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: Fixed compile errors Created 5 years, 1 month 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/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 66d9b2c1788b9b2d37e92c25eca1df27c527d796..0f526f205e15cd7a44b76e308ffc53436d975ef0 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -403,6 +403,12 @@ void CustomButton::OnBlur() {
SetState(STATE_NORMAL);
}
+void CustomButton::NotifyClick(const ui::Event& event) {
+ Button::NotifyClick(event);
+ if (ink_drop_delegate())
+ ink_drop_delegate()->OnAction(views::InkDropState::QUICK_ACTION);
varkha 2015/11/27 22:07:50 If we are doing this in CustomButton then we shoul
bruthig 2015/12/07 18:44:46 Done.
+}
+
bool CustomButton::IsChildWidget() const {
return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
}
« chrome/browser/ui/views/toolbar/toolbar_button.cc ('K') | « ui/views/controls/button/custom_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698