Rename of InkDropAnimationController classes to InkDrop.

ui/views/animation/ink_drop_factory.cc

Index: ui/views/animation/ink_drop_factory.cc
diff --git a/ui/views/animation/ink_drop_factory.cc b/ui/views/animation/ink_drop_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3720e18f09b41c55f1fb3d1e9274ac5cd9af4672
--- /dev/null
+++ b/ui/views/animation/ink_drop_factory.cc
@@ -0,0 +1,71 @@
+// 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_factory.h"
+
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/views/animation/ink_drop.h"
+#include "ui/views/animation/ink_drop_impl.h"
+#include "ui/views/views_export.h"
+
+namespace views {
+
+namespace {
+
+// A stub implementation of an InkDrop that can be used when material  design is

[tdanderson, 2016/05/04 14:19:24]

nit: extra space

[bruthig, 2016/05/04 17:55:13]

Done.

+// not enabled.
+class InkDropStub : public InkDrop {
+ public:
+  explicit InkDropStub();
+  ~InkDropStub() override;
+
+  // InkDrop:
+  InkDropState GetTargetInkDropState() const override;
+  bool IsVisible() const override;
+  void AnimateToState(InkDropState state) override;
+  void SnapToActivated() override;
+  void SetHovered(bool is_hovered) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InkDropStub);
+};
+
+InkDropStub::InkDropStub() {}
+
+InkDropStub::~InkDropStub() {}
+
+InkDropState InkDropStub::GetTargetInkDropState() const {
+  return InkDropState::HIDDEN;
+}
+
+bool InkDropStub::IsVisible() const {
+  return false;
+}
+
+void InkDropStub::AnimateToState(InkDropState state) {}
+
+void InkDropStub::SnapToActivated() {}
+
+void InkDropStub::SetHovered(bool is_hovered) {}
+
+}  // namespace
+
+InkDropFactory::InkDropFactory() {}
+
+InkDropFactory::~InkDropFactory() {}
+
+std::unique_ptr<InkDrop> InkDropFactory::CreateInkDrop(
+    InkDropHost* ink_drop_host) {
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    return base::WrapUnique(new InkDropImpl(ink_drop_host));
+  }
+
+  return base::WrapUnique(new InkDropStub());
+}
+
+}  // namespace views