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

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

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

Index: ui/views/animation/ink_drop_host.h

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

index ab9f165080d75ee0fd8cd1ab8e714484a655efb6..956a624c2bb194f7a408c301ac45c6e874112ada 100644

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

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

@@ -6,6 +6,7 @@

#define UI_VIEWS_ANIMATION_INK_DROP_HOST_H_

#include "base/macros.h"

+#include "third_party/skia/include/core/SkColor.h"

#include "ui/gfx/geometry/point.h"

#include "ui/views/views_export.h"

@@ -39,6 +40,10 @@ class VIEWS_EXPORT InkDropHost {

// Returns true if the InkDropHover should be shown.

virtual bool ShouldShowInkDropHover() const = 0;

+ // Returns the color to be used to draw the press and hover effects (before an

+ // alpha is applied).

+ virtual SkColor GetInkDropBaseColor() const = 0;

private:

DISALLOW_COPY_AND_ASSIGN(InkDropHost);

};