ui/views/controls/button/custom_button.cc - Issue 1411833006: Refactoring to make adding ink drop animations easier

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 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

« ui/views/animation/toolbar_ink_drop_delegate.cc ('K') | « ui/views/animation/toolbar_ink_drop_delegate.cc ('k') | ui/views/controls/button/menu_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7bab3b69e4a007ea44ba4d15264ad40d641df674..e117ca25d48c10f91ab7cc37344ed5cb1f07c0e4 100644

--- a/ui/views/controls/button/custom_button.cc

+++ b/ui/views/controls/button/custom_button.cc

@@ -243,8 +243,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) {

« ui/views/animation/toolbar_ink_drop_delegate.cc ('K') | « ui/views/animation/toolbar_ink_drop_delegate.cc ('k') | ui/views/controls/button/menu_button.h » ('j') | no next file with comments »