Pushed InkDropHost inheritence up to CustomButton.

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

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
index 96bd4bd955b6b9afa9c263644956aad6fd0a0c15..4d2897aca039b9652d1a708730c2cc30f58a1dc4 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -7,7 +7,6 @@
 
 #include "base/callback.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
-#include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
@@ -37,8 +36,7 @@ class MenuRunner;
 class ToolbarActionView : public views::MenuButton,
                           public ToolbarActionViewDelegateViews,
                           public views::MenuButtonListener,
-                          public views::ContextMenuController,
-                          public views::InkDropHost {
+                          public views::ContextMenuController {
  public:
   // Need DragController here because ToolbarActionView could be
   // dragged/dropped.
@@ -86,10 +84,6 @@ class ToolbarActionView : public views::MenuButton,
   void OnMenuButtonClicked(views::View* sender,
                            const gfx::Point& point) override;
 
-  // views::InkDropHost:
-  void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
-  void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
-
   ToolbarActionViewController* view_controller() {
     return view_controller_;
   }
@@ -114,6 +108,8 @@ class ToolbarActionView : public views::MenuButton,
   void OnDragDone() override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
+  void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
+  void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
 
   // ToolbarActionViewDelegateViews:
   views::View* GetAsView() override;
@@ -128,9 +124,6 @@ class ToolbarActionView : public views::MenuButton,
                               const gfx::Point& point,
                               ui::MenuSourceType source_type) override;
 
-  // views::InkDropHost:
-  gfx::Point CalculateInkDropCenter() const override;
-
   // Shows the context menu (if one exists) for the toolbar action.
   void DoShowContextMenu(ui::MenuSourceType source_type);