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

chrome/browser/ui/views/toolbar/toolbar_button.h

Index: chrome/browser/ui/views/toolbar/toolbar_button.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h
index 9526915aa226e7ac4a048f9127499bd26cb4288f..f4ee43725928641727439973b547ecdc2577d24c 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -17,7 +17,6 @@ class MenuModel;
 }
 
 namespace views {
-class InkDropAnimationController;
 class MenuRunner;
 }
 
@@ -42,7 +41,6 @@ class ToolbarButton : public views::LabelButton,
 
   // views::LabelButton:
   gfx::Size GetPreferredSize() const override;
-  void Layout() override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
@@ -65,8 +63,6 @@ class ToolbarButton : public views::LabelButton,
  protected:
   // views::LabelButton:
   bool ShouldEnterPushedState(const ui::Event& event) override;
-  void NotifyClick(const ui::Event& event) override;
-  void OnClickCanceled(const ui::Event& event) override;
 
   // Returns if menu should be shown. Override this to change default behavior.
   virtual bool ShouldShowMenu();
@@ -74,10 +70,6 @@ class ToolbarButton : public views::LabelButton,
   // Function to show the dropdown menu.
   virtual void ShowDropDownMenu(ui::MenuSourceType source_type);
 
-  views::InkDropAnimationController* ink_drop_animation_controller() {
-    return ink_drop_animation_controller_.get();
-  }
-
  private:
   // views::LabelButton:
   const char* GetClassName() const override;
@@ -97,8 +89,8 @@ class ToolbarButton : public views::LabelButton,
   // Menu runner to display drop down menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
-  // 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:36]

Needs a forward declaration for InkDropDelegate.

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

Done.

 
   // A factory for tasks that show the dropdown context menu for the button.
   base::WeakPtrFactory<ToolbarButton> show_menu_factory_;