ui/views/animation/ink_drop_impl.h - 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/animation/ink_drop_impl.h

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/animation/ink_drop_impl.h

diff --git a/ui/views/animation/ink_drop_impl.h b/ui/views/animation/ink_drop_impl.h

index 47b8f508657200ada6560f48b85746960758c5d4..2b92d7a758961ac65e2cb5e8b0bcb9e20e8fed1f 100644

--- a/ui/views/animation/ink_drop_impl.h

+++ b/ui/views/animation/ink_drop_impl.h

@@ -41,7 +41,6 @@ class VIEWS_EXPORT InkDropImpl : public InkDrop,

// InkDrop:

InkDropState GetTargetInkDropState() const override;

- bool IsVisible() const override;

void AnimateToState(InkDropState ink_drop_state) override;

void SnapToActivated() override;

void SetHovered(bool is_hovered) override;

« no previous file with comments | « ui/views/animation/ink_drop_host_view.cc ('k') | ui/views/animation/ink_drop_impl.cc » ('j') | no next file with comments »