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

Unified Diff: ui/views/animation/ink_drop_animation_unittest.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: 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_animation_controller_impl.cc ('k') | ui/views/animation/ink_drop_host_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_animation_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_unittest.cc b/ui/views/animation/ink_drop_animation_unittest.cc
index 5ac7757473bc215a1c5f8ed621fc729f4c99b621..c832e70ad9478b22e8f61903fd0c2209106ac1a5 100644
--- a/ui/views/animation/ink_drop_animation_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_unittest.cc
@@ -53,14 +53,15 @@ InkDropAnimationTest::InkDropAnimationTest() {
switch (GetParam()) {
case SQUARE_INK_DROP_ANIMATION: {
SquareInkDropAnimation* typed_ink_drop_animation =
- new SquareInkDropAnimation(gfx::Size(10, 10), 2, gfx::Size(8, 8), 1);
+ new SquareInkDropAnimation(gfx::Size(10, 10), 2, gfx::Size(8, 8), 1,
+ gfx::Point(), SK_ColorBLACK);
ink_drop_animation_.reset(typed_ink_drop_animation);
test_api_.reset(
new SquareInkDropAnimationTestApi(typed_ink_drop_animation));
break;
}
}
- ink_drop_animation_->AddObserver(&observer_);
+ ink_drop_animation_->set_observer(&observer_);
observer_.set_ink_drop_animation(ink_drop_animation_.get());
test_api_->SetDisableAnimationTimers(true);
}
« no previous file with comments | « ui/views/animation/ink_drop_animation_controller_impl.cc ('k') | ui/views/animation/ink_drop_host_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698