ui/views/controls/button/custom_button.h - Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

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

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: Moved some ripple controlling logic up the Button hierarchy. 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

« chrome/browser/ui/views/toolbar/toolbar_button.cc ('K') | « ui/views/animation/button_ink_drop_delegate.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/button/custom_button.h

diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h

index ef250c0b81f1087bc8b3478f4db6138421c4a67b..d08c94c09b682865e46cf14326885ee5754d975e 100644

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

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

@@ -137,6 +137,10 @@ class VIEWS_EXPORT CustomButton : public Button,

const ViewHierarchyChangedDetails& details) override;

void OnBlur() override;

+ // Overridden from Button:

+ void NotifyClick(const ui::Event& event) override;

+ void OnClickCanceled(const ui::Event& event) override;

// The button state (defined in implementation)

ButtonState state_;