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

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

Index: chrome/browser/ui/views/toolbar/app_menu_button.h
diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.h b/chrome/browser/ui/views/toolbar/app_menu_button.h
index 2536f543d92fb919f799695ecad511d54f2bbfa3..0ef292e75c10fcccb0d050d889202d4e387a6e06 100644
--- a/chrome/browser/ui/views/toolbar/app_menu_button.h
+++ b/chrome/browser/ui/views/toolbar/app_menu_button.h
@@ -18,7 +18,6 @@ class AppMenu;
 class AppMenuModel;
 
 namespace views {
-class InkDropAnimationController;
 class LabelButtonBorder;
 class MenuListener;
 }
@@ -85,7 +84,6 @@ class AppMenuButton : public views::InkDropHost,
       std::set<ui::Clipboard::FormatType>* format_types) override;
   bool AreDropTypesRequired() override;
   bool CanDrop(const ui::OSExchangeData& data) override;
-  void Layout() override;
   void OnDragEntered(const ui::DropTargetEvent& event) override;
   int OnDragUpdated(const ui::DropTargetEvent& event) override;
   void OnDragExited() override;
@@ -98,9 +96,6 @@ class AppMenuButton : public views::InkDropHost,
   // Only used in MD.
   AppMenuIconPainter::Severity severity_;
 
-  // Animation controller for the ink drop ripple effect.
-  scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
-
   // Our owning toolbar view.
   ToolbarView* toolbar_view_;
 
@@ -125,6 +120,9 @@ class AppMenuButton : public views::InkDropHost,
   // a maximized state to extend to the full window width.
   int margin_trailing_;
 
+  // Controls the visual feedback for the button state.
+  scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;

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

Do you need a forward declaration for InkDropDelegate?

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

Done.

+
   // Used to spawn weak pointers for delayed tasks to open the overflow menu.
   base::WeakPtrFactory<AppMenuButton> weak_factory_;