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

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

Issue 1937103003: Rename of InkDropAnimation classes to InkDropRipple. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test_ink_drop_animation_observer.h from views.gyp and doc update. Created 4 years, 8 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_host_view.h ('k') | ui/views/animation/ink_drop_ripple.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a8714ce975c278a4cbcfab1596e7d220a38d3549..faf32b07d816bab75fed2fe7b3ae2dd0148570d4 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -7,7 +7,7 @@
#include "ui/gfx/color_palette.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/views/animation/ink_drop_hover.h"
-#include "ui/views/animation/square_ink_drop_animation.h"
+#include "ui/views/animation/square_ink_drop_ripple.h"
namespace views {
@@ -46,13 +46,12 @@ void InkDropHostView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
SetPaintToLayer(false);
}
-std::unique_ptr<InkDropAnimation> InkDropHostView::CreateInkDropAnimation()
- const {
- std::unique_ptr<InkDropAnimation> animation(new SquareInkDropAnimation(
+std::unique_ptr<InkDropRipple> InkDropHostView::CreateInkDropRipple() const {
+ std::unique_ptr<InkDropRipple> ripple(new SquareInkDropRipple(
CalculateLargeInkDropSize(ink_drop_size_), kInkDropLargeCornerRadius,
ink_drop_size_, kInkDropSmallCornerRadius, GetInkDropCenter(),
GetInkDropBaseColor()));
- return animation;
+ return ripple;
}
std::unique_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
« no previous file with comments | « ui/views/animation/ink_drop_host_view.h ('k') | ui/views/animation/ink_drop_ripple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698