Enhance the material design ripple API so the ripple's state can be controlled by it's owning View.

ui/views/animation/ink_drop_animation_controller_factory.cc

Index: ui/views/animation/ink_drop_animation_controller_factory.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_factory.cc b/ui/views/animation/ink_drop_animation_controller_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..08ba0fc9de8afa4a44e15038f01f9aabfae1611a
--- /dev/null
+++ b/ui/views/animation/ink_drop_animation_controller_factory.cc
@@ -0,0 +1,78 @@
+// 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/ink_drop_animation_controller_factory.h"
+
+#include "ui/base/resource/material_design/material_design_controller.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/views/animation/ink_drop_animation_controller.h"
+#include "ui/views/animation/ink_drop_animation_controller_impl.h"
+#include "ui/views/views_export.h"
+
+namespace views {
+
+namespace {
+
+// A stub implementation of an InkDropAnimationController that can be used when
+// material design is not enabled.
+class VIEWS_EXPORT InkDropAnimationControllerStub
+    : public InkDropAnimationController {

[jonross, 2015/08/11 20:34:46]

Why not just have InkDropAnimationController contain this stub's implementation?
Instead of being purely virtual.

[bruthig, 2015/08/12 15:26:40]

Since InkDropAnimationController is purely virtual it is clear to a developer
trying to use it that there is a choice to be made, instead of them blindly
using the InkDropAnimationController and wondering why it's not working. 
Secondly it provides a test seam to inject a TestInkDropAnimationController that
can be used for test with the simplification that it can be controlled
synchronously from the tests and wouldn't depend on the actual animation
framework for timing.

+ public:
+  explicit InkDropAnimationControllerStub(InkDropHost* ink_drop_host);
+  ~InkDropAnimationControllerStub() override;
+
+  // InkDropAnimationController:
+  void AnimateToState(InkDropState state) override;
+  void SetInkDropSize(const gfx::Size& size) override;
+  gfx::Rect GetInkDropBounds() const override;
+  void SetInkDropBounds(const gfx::Rect& bounds) override;
+
+ private:
+  // The bounds of the ink drop layers. Defined in the coordinate space of the
+  // parent ui::Layer that the ink drop layers were added to.
+  gfx::Rect ink_drop_bounds_;

[tdanderson, 2015/08/11 19:07:41]

Do you actually need to have this member in the stub?

[bruthig, 2015/08/12 15:26:40]

I put this in, in case any of the InkDropHosts or IDAC owners rely on the fact
that the following code must be true:

idac->SetInkDropBounds(bounds);
CHECK_EQ(idac->GetInkDropBounds(), bounds);

Essentially this is a contract declared by the pure virtual
InkDropAnimationController class, not just it's InkDropAnimationControllerImpl
derivative.

+
+  DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerStub);
+};
+
+InkDropAnimationControllerStub::InkDropAnimationControllerStub(
+    InkDropHost* ink_drop_host)
+    : InkDropAnimationController(ink_drop_host) {}
+
+InkDropAnimationControllerStub::~InkDropAnimationControllerStub() {}
+
+void InkDropAnimationControllerStub::AnimateToState(InkDropState state) {}
+
+void InkDropAnimationControllerStub::SetInkDropSize(const gfx::Size& size) {
+  ink_drop_bounds_.set_size(size);
+}
+
+gfx::Rect InkDropAnimationControllerStub::GetInkDropBounds() const {
+  return ink_drop_bounds_;
+}
+
+void InkDropAnimationControllerStub::SetInkDropBounds(const gfx::Rect& bounds) {
+  ink_drop_bounds_ = bounds;
+}
+
+}  // namespace
+
+InkDropAnimationControllerFactory::InkDropAnimationControllerFactory() {}
+
+InkDropAnimationControllerFactory::~InkDropAnimationControllerFactory() {}
+
+scoped_ptr<InkDropAnimationController>
+InkDropAnimationControllerFactory::CreateInkDropAnimationController(
+    InkDropHost* ink_drop_host) {
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    return scoped_ptr<InkDropAnimationController>(
+        new InkDropAnimationControllerImpl(ink_drop_host));
+  } else {
+    return scoped_ptr<InkDropAnimationController>(
+        new InkDropAnimationControllerStub(ink_drop_host));
+  }
+}
+
+}  // namespace views