Allow InkDropRipple to co-exist with highlight

ui/views/animation/empty_ink_drop_ripple.cc

Index: ui/views/animation/empty_ink_drop_ripple.cc
diff --git a/ui/views/animation/empty_ink_drop_ripple.cc b/ui/views/animation/empty_ink_drop_ripple.cc
new file mode 100644
index 0000000000000000000000000000000000000000..395538922eecb8ed2fcf06de931737a82c80e5ba
--- /dev/null
+++ b/ui/views/animation/empty_ink_drop_ripple.cc
@@ -0,0 +1,30 @@
+// Copyright 2016 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/empty_ink_drop_ripple.h"
+
+namespace views {
+
+EmptyInkDropRipple::EmptyInkDropRipple() {}
+
+EmptyInkDropRipple::~EmptyInkDropRipple() {}
+
+void EmptyInkDropRipple::AnimateToState(InkDropState ink_drop_state) {}
+
+void EmptyInkDropRipple::SnapToActivated() {}
+
+ui::Layer* EmptyInkDropRipple::GetRootLayer() { return nullptr; }
+
+bool EmptyInkDropRipple::OverridesHighlight() const { return false; }
+
+void EmptyInkDropRipple::AnimateStateChange(
+    InkDropState old_ink_drop_state,
+    InkDropState new_ink_drop_state,
+    ui::LayerAnimationObserver* observer) {}
+
+void EmptyInkDropRipple::SetStateToHidden() {}
+
+void EmptyInkDropRipple::AbortAllAnimations() {}
+
+}  // namespace views