Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Unified Diff: ui/views/animation/square_ink_drop_animation.h

Issue 1724963002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky review 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
« no previous file with comments | « ui/views/animation/ink_drop_hover_unittest.cc ('k') | ui/views/animation/square_ink_drop_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/square_ink_drop_animation.h
diff --git a/ui/views/animation/square_ink_drop_animation.h b/ui/views/animation/square_ink_drop_animation.h
index 1e62b3dd3b669a60d5438c4445d705936e1911a3..c0fd3b12e9b532d4f82f731c75583bb4aad1926c 100644
--- a/ui/views/animation/square_ink_drop_animation.h
+++ b/ui/views/animation/square_ink_drop_animation.h
@@ -19,6 +19,10 @@
#include "ui/views/animation/ink_drop_state.h"
#include "ui/views/views_export.h"
+namespace gfx {
+class Point;
+} // namespace gfx
+
namespace ui {
class CallbackLayerAnimationObserver;
class Layer;
@@ -53,7 +57,9 @@ class VIEWS_EXPORT SquareInkDropAnimation : public InkDropAnimation {
SquareInkDropAnimation(const gfx::Size& large_size,
int large_corner_radius,
const gfx::Size& small_size,
- int small_corner_radius);
+ int small_corner_radius,
+ const gfx::Point& center_point,
+ SkColor color);
~SquareInkDropAnimation() override;
// InkDropAnimation:
@@ -61,7 +67,6 @@ class VIEWS_EXPORT SquareInkDropAnimation : public InkDropAnimation {
InkDropState GetTargetInkDropState() const override;
bool IsVisible() const override;
void AnimateToState(InkDropState ink_drop_state) override;
- void SetCenterPoint(const gfx::Point& center_point) override;
void HideImmediately() override;
private:
« no previous file with comments | « ui/views/animation/ink_drop_hover_unittest.cc ('k') | ui/views/animation/square_ink_drop_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698