Tweaks to "Allow InkDropRipple to co-exist with highlight or not exist at all."

ui/views/animation/test/test_ink_drop_host.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/animation/test/test_ink_drop_host.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/views/animation/empty_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/square_ink_drop_ripple.h"
 #include "ui/views/animation/test/ink_drop_highlight_test_api.h"
 #include "ui/views/animation/test/square_ink_drop_ripple_test_api.h"
 
 namespace views {
 
 namespace {
 
 // Test specific subclass of InkDropRipple that returns a test api from
 // GetTestApi().
 class TestInkDropRipple : public SquareInkDropRipple {
  public:
   TestInkDropRipple(const gfx::Size& large_size,
                     int large_corner_radius,
                     const gfx::Size& small_size,
                     int small_corner_radius,
                     const gfx::Point& center_point,
                     SkColor color,
-                    float visible_opacity)
+                    float visible_opacity,
+                    bool overrides_highlight)
       : SquareInkDropRipple(large_size,
                             large_corner_radius,
                             small_size,
                             small_corner_radius,
                             center_point,
                             color,
-                            visible_opacity) {}
+                            visible_opacity),
+        overrides_highlight_(overrides_highlight) {}
 
   ~TestInkDropRipple() override {}
 
   test::InkDropRippleTestApi* GetTestApi() override {
     if (!test_api_)
       test_api_.reset(new test::SquareInkDropRippleTestApi(this));
     return test_api_.get();
   }
 
+  bool OverridesHighlight() const override { return overrides_highlight_; }
+
  private:
   std::unique_ptr<test::InkDropRippleTestApi> test_api_;
+  bool overrides_highlight_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInkDropRipple);
 };
 
 // Test specific subclass of InkDropHighlight that returns a test api from
 // GetTestApi().
 class TestInkDropHighlight : public InkDropHighlight {
  public:
   TestInkDropHighlight(const gfx::Size& size,
                        int corner_radius,
@@ skipping 13 matching lines @@
   std::unique_ptr<test::InkDropHighlightTestApi> test_api_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInkDropHighlight);
 };
 
 }  // namespace
 
 TestInkDropHost::TestInkDropHost()
     : num_ink_drop_layers_(0),
       should_show_highlight_(false),
+      should_show_ripple_(true),
+      ripple_overrides_highlight_(true),
       disable_timers_for_test_(false) {}
 
 TestInkDropHost::~TestInkDropHost() {}
 
 void TestInkDropHost::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   ++num_ink_drop_layers_;
 }
 
 void TestInkDropHost::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   --num_ink_drop_layers_;
 }
 
 std::unique_ptr<InkDropRipple> TestInkDropHost::CreateInkDropRipple() const {
   gfx::Size size(10, 10);
-  std::unique_ptr<InkDropRipple> ripple(new TestInkDropRipple(
-      size, 5, size, 5, gfx::Point(), SK_ColorBLACK, 0.175f));
-  if (disable_timers_for_test_)
-    ripple->GetTestApi()->SetDisableAnimationTimers(true);
+  std::unique_ptr<InkDropRipple> ripple(new EmptyInkDropRipple());
+  if (should_show_ripple_) {
+    ripple.reset(new TestInkDropRipple(size, 5, size, 5, gfx::Point(),
+                                       SK_ColorBLACK, 0.175f,
+                                       ripple_overrides_highlight_));
+    if (disable_timers_for_test_)
+      ripple->GetTestApi()->SetDisableAnimationTimers(true);
+  }
   return ripple;
 }
 
 std::unique_ptr<InkDropHighlight> TestInkDropHost::CreateInkDropHighlight()
     const {
   std::unique_ptr<InkDropHighlight> highlight;
   if (should_show_highlight_) {
     highlight.reset(new TestInkDropHighlight(gfx::Size(10, 10), 4,
                                              gfx::PointF(), SK_ColorBLACK));
     if (disable_timers_for_test_)
       highlight->GetTestApi()->SetDisableAnimationTimers(true);
   }
   return highlight;
 }
 
 }  // namespace views