Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

chrome/browser/ui/views/bar_control_button.h

Index: chrome/browser/ui/views/bar_control_button.h
diff --git a/chrome/browser/ui/views/bar_control_button.h b/chrome/browser/ui/views/bar_control_button.h
index 8bc3917b3e9ad03e8a1c7c0b465e482a4450543a..665c2cb8c6eff35de2532bf59e03458d238d2c29 100644
--- a/chrome/browser/ui/views/bar_control_button.h
+++ b/chrome/browser/ui/views/bar_control_button.h
@@ -7,6 +7,7 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/controls/button/image_button.h"
 
@@ -14,10 +15,6 @@ namespace gfx {
 enum class VectorIconId;
 }
 
-namespace views {
-class InkDropAnimationController;
-}
-
 // A class for buttons that control bars (find bar, download shelf, etc.). The
 // button has an image and no text.
 class BarControlButton : public views::ImageButton, public views::InkDropHost {
@@ -33,11 +30,7 @@ class BarControlButton : public views::ImageButton, public views::InkDropHost {
   // views::ImageButton:
   void OnThemeChanged() override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
-  void Layout() override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
-  void OnGestureEvent(ui::GestureEvent* event) override;
-  void OnMouseReleased(const ui::MouseEvent& event) override;
-  void NotifyClick(const ui::Event& event) override;
 
  private:
   // views::InkDropHost:
@@ -48,8 +41,8 @@ class BarControlButton : public views::ImageButton, public views::InkDropHost {
   gfx::VectorIconId id_;
   base::Callback<SkColor(void)> get_text_color_callback_;
 
-  // Animation controller for the ink drop ripple effect.
-  scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
+  // Controls the visual feedback for the button state.
+  scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;

[varkha, 2015/12/09 21:23:35]

Do you need forward declaration for InkDropDelegate?

[bruthig, 2015/12/11 22:09:45]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(BarControlButton);
 };