Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

ui/views/views.gyp

Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 2dbaf6099fa75c954579119fd424f4b052bf2d53..2d20d5f53a92f375d9d05bcd49f6a80618dda5c2 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -14,33 +14,32 @@
       'accessible_pane_view.h',
       'animation/bounds_animator.cc',
       'animation/bounds_animator.h',
-      'animation/button_ink_drop_delegate.cc',
-      'animation/button_ink_drop_delegate.h',
-      'animation/ink_drop_ripple.cc',
-      'animation/ink_drop_ripple.h',
+      'animation/flood_fill_ink_drop_ripple.cc',
+      'animation/flood_fill_ink_drop_ripple.h',
       'animation/ink_drop.h',
-      'animation/ink_drop_factory.cc',
-      'animation/ink_drop_factory.h',
-      'animation/ink_drop_impl.cc',
-      'animation/ink_drop_impl.h',
       'animation/ink_drop_animation_ended_reason.cc',
       'animation/ink_drop_animation_ended_reason.h',
-      'animation/ink_drop_ripple_observer.h',
-      'animation/ink_drop_delegate.h',
+      'animation/ink_drop_factory.cc',
+      'animation/ink_drop_factory.h',
       'animation/ink_drop_highlight.cc',
       'animation/ink_drop_highlight.h',
       'animation/ink_drop_highlight_observer.h',
       'animation/ink_drop_host.h',
       'animation/ink_drop_host_view.cc',
       'animation/ink_drop_host_view.h',
+      'animation/ink_drop_impl.cc',
+      'animation/ink_drop_impl.h',
       'animation/ink_drop_painted_layer_delegates.cc',
       'animation/ink_drop_painted_layer_delegates.h',
+      'animation/ink_drop_ripple.cc',
+      'animation/ink_drop_ripple.h',
+      'animation/ink_drop_ripple_observer.h',
       'animation/ink_drop_state.cc',
       'animation/ink_drop_state.h',
+      'animation/ink_drop_stub.h',
+      'animation/ink_drop_stub.cc',
       'animation/scroll_animator.cc',
       'animation/scroll_animator.h',
-      'animation/flood_fill_ink_drop_ripple.cc',
-      'animation/flood_fill_ink_drop_ripple.h',
       'animation/square_ink_drop_ripple.cc',
       'animation/square_ink_drop_ripple.h',
       'background.cc',
@@ -497,6 +496,8 @@
       'animation/test/flood_fill_ink_drop_ripple_test_api.h',
       'animation/test/ink_drop_highlight_test_api.cc',
       'animation/test/ink_drop_highlight_test_api.h',
+      'animation/test/ink_drop_host_view_test_api.cc',
+      'animation/test/ink_drop_host_view_test_api.h',
       'animation/test/ink_drop_impl_test_api.cc',
       'animation/test/ink_drop_impl_test_api.h',
       'animation/test/ink_drop_ripple_test_api.cc',
@@ -504,9 +505,9 @@
       'animation/test/ink_drop_utils.cc',
       'animation/test/square_ink_drop_ripple_test_api.cc',
       'animation/test/square_ink_drop_ripple_test_api.h',
+      'animation/test/test_ink_drop.cc',
+      'animation/test/test_ink_drop.h',
       'animation/test/test_ink_drop_animation_observer_helper.h',
-      'animation/test/test_ink_drop_delegate.cc',
-      'animation/test/test_ink_drop_delegate.h',
       'animation/test/test_ink_drop_highlight_observer.cc',
       'animation/test/test_ink_drop_highlight_observer.h',
       'animation/test/test_ink_drop_host.cc',