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

Unified Diff: ui/views/animation/square_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/square_ink_drop_animation_unittest.cc
diff --git a/ui/views/animation/square_ink_drop_animation_unittest.cc b/ui/views/animation/square_ink_drop_animation_unittest.cc
index c056e5b09e6eb42715b482ff1bfcc2d321d7887b..efd5dfadf33e1f3337c9ab1213370bdf26fc7935 100644
--- a/ui/views/animation/square_ink_drop_animation_unittest.cc
+++ b/ui/views/animation/square_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_observer.h"
@@ -47,7 +48,8 @@ TEST(SquareInkDropAnimationTest,
const gfx::Point bottom_mid(kHalfDrawnSize, kDrawnSize);
scoped_ptr<SquareInkDropAnimation> ink_drop_animation(
- new SquareInkDropAnimation(gfx::Size(kDrawnSize, kDrawnSize), 2,
+ new SquareInkDropAnimation(gfx::kPlaceholderColor,
+ gfx::Size(kDrawnSize, kDrawnSize), 2,
gfx::Size(kHalfDrawnSize, kHalfDrawnSize), 1));
SquareInkDropAnimationTestApi test_api(ink_drop_animation.get());
@@ -153,7 +155,8 @@ TEST(SquareInkDropAnimationTest,
const gfx::Point bottom_mid(kHalfDrawnSize, kDrawnSize);
scoped_ptr<SquareInkDropAnimation> ink_drop_animation(
- new SquareInkDropAnimation(gfx::Size(kDrawnSize, kDrawnSize), 2,
+ new SquareInkDropAnimation(gfx::kPlaceholderColor,
+ gfx::Size(kDrawnSize, kDrawnSize), 2,
gfx::Size(kHalfDrawnSize, kHalfDrawnSize), 1));
SquareInkDropAnimationTestApi test_api(ink_drop_animation.get());

Powered by Google App Engine
This is Rietveld 408576698