ui/views/controls/button/md_text_button.cc - Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

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/md_text_button.cc

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed merge conflict in custom_button.cc Created 4 years, 6 months 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/md_text_button.cc

diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc

index d53d151c2f1bec80e7c7a5194377e4d28b2afbb5..2900a46a45ea7e6210b0d01df7245dc1277f0b15 100644

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

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

@@ -173,8 +173,7 @@ MdTextButton::MdTextButton(ButtonListener* listener)

: LabelButton(listener, base::string16()),

focus_ring_(new MdFocusRing()),

cta_(NO_CALL_TO_ACTION) {

- set_ink_drop_delegate(

- base::WrapUnique(new ButtonInkDropDelegate(this, this)));

+ SetHasInkDrop(true);

set_has_ink_drop_action_on_click(true);

SetHorizontalAlignment(gfx::ALIGN_CENTER);

SetFocusForPlatform();

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