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: Refactor ink drop animations (simplify MenuButton) 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/label_button.cc » ('j') | ui/views/controls/button/menu_button.cc » ('J')
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 61b595bbfeb2f059327527ad3c1ef18e76afb270..72df3e217aee231c2298171e96de296ef71ab11e 100644

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

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

@@ -277,6 +277,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) {