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

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

Issue 1411833006: Refactoring to make adding ink drop animations easier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Attempt to refactor ink drop animations (moving more stuff into InkDropDelegate) 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 61b595bbfeb2f059327527ad3c1ef18e76afb270..feb5e2381133d093970e3c3bb5d2f4a3a4f325d0 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -246,8 +246,7 @@ void CustomButton::OnGestureEvent(ui::GestureEvent* event) {
event->type() == ui::ET_GESTURE_END) {
SetState(STATE_NORMAL);
}
- if (!event->handled())
- Button::OnGestureEvent(event);
+ Button::OnGestureEvent(event);
}
bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
@@ -277,6 +276,7 @@ void CustomButton::OnDragDone() {
// (since disabled buttons may still be able to be dragged).
if (state_ != STATE_DISABLED)
SetState(STATE_NORMAL);
+ Button::OnDragDone();
}
void CustomButton::GetAccessibleState(ui::AXViewState* state) {

Powered by Google App Engine
This is Rietveld 408576698