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

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

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
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 246a78d1b7709583b476c9cd72caf7f36fd12f3e..5d2fa22874092e813a914669fe5ab4adc27075ba 100644
--- a/ui/views/animation/ink_drop_animation_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_unittest.cc
@@ -8,6 +8,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/color_palette.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/size_f.h"
#include "ui/views/animation/ink_drop_animation.h"
@@ -229,7 +230,8 @@ InkDropAnimationDerivativesTest::InkDropAnimationDerivativesTest() {
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::kPlaceholderColor, gfx::Size(10, 10),
+ 2, gfx::Size(8, 8), 1);
ink_drop_animation_.reset(typed_ink_drop_animation);
test_api_.reset(
new SquareInkDropAnimationTestApi(typed_ink_drop_animation));

Powered by Google App Engine
This is Rietveld 408576698