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

Unified Diff: ui/views/animation/ink_drop_host_view.cc

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: self review and format 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
Index: ui/views/animation/ink_drop_host_view.cc
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index d19978c398f26c5d96492cf9f26d2f7a9bbe0c8c..3e026449afd3e33f2fcc9bad9a024fb140da5154 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -4,6 +4,7 @@
#include "ui/views/animation/ink_drop_host_view.h"
+#include "ui/gfx/color_palette.h"
#include "ui/views/animation/ink_drop_hover.h"
#include "ui/views/animation/square_ink_drop_animation.h"
@@ -37,16 +38,14 @@ scoped_ptr<InkDropAnimation> InkDropHostView::CreateInkDropAnimation() const {
gfx::Size(kInkDropLargeSize, kInkDropLargeSize),
kInkDropLargeCornerRadius,
gfx::Size(kInkDropSmallSize, kInkDropSmallSize),
- kInkDropSmallCornerRadius));
- animation->SetCenterPoint(GetInkDropCenter());
+ kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
return animation;
}
scoped_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
- scoped_ptr<InkDropHover> hover(
- new InkDropHover(gfx::Size(kInkDropSmallSize, kInkDropSmallSize),
- kInkDropSmallCornerRadius));
- hover->SetCenterPoint(GetInkDropCenter());
+ scoped_ptr<InkDropHover> hover(new InkDropHover(
+ gfx::Size(kInkDropSmallSize, kInkDropSmallSize),
+ kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
return hover;
}
@@ -54,4 +53,9 @@ gfx::Point InkDropHostView::GetInkDropCenter() const {
return GetLocalBounds().CenterPoint();
}
+SkColor InkDropHostView::GetInkDropBaseColor() const {
+ NOTREACHED();
+ return gfx::kPlaceholderColor;
+}
+
} // namespace views

Powered by Google App Engine
This is Rietveld 408576698