ui/views/animation/ink_drop_animation_controller_factory.cc - Issue 1682893002: Color the ink drop ripple and hover effects based on theming.

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_animation_controller_factory.cc

Issue 1682893002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix unit tests Created 4 years, 10 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

« chrome/browser/ui/views/bar_control_button.cc ('K') | « ui/views/animation/ink_drop_animation_controller.h ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | ui/views/animation/ink_drop_animation_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/animation/ink_drop_animation_controller_factory.cc

diff --git a/ui/views/animation/ink_drop_animation_controller_factory.cc b/ui/views/animation/ink_drop_animation_controller_factory.cc

index d20fe1f24f0c911b8a37846453cdd69a47990735..4efaecf5005dbf65573e117ccffbdf2f553fcf07 100644

--- a/ui/views/animation/ink_drop_animation_controller_factory.cc

+++ b/ui/views/animation/ink_drop_animation_controller_factory.cc

@@ -30,7 +30,6 @@ class InkDropAnimationControllerStub

void AnimateToState(InkDropState state) override;

void SetHovered(bool is_hovered) override;

bool IsHovered() const override;

- gfx::Size GetInkDropLargeSize() const override;

void SetInkDropSize(const gfx::Size& large_size,

int large_corner_radius,

const gfx::Size& small_size,

@@ -70,10 +69,6 @@ bool InkDropAnimationControllerStub::IsHovered() const {

return is_hovered_;

}

-gfx::Size InkDropAnimationControllerStub::GetInkDropLargeSize() const {

- return gfx::Size();

void InkDropAnimationControllerStub::SetInkDropSize(const gfx::Size& large_size,

int large_corner_radius,

const gfx::Size& small_size,