Pushed InkDropHost inheritence up to CustomButton.

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 0feb40acc1518eb7e5b4b14a66211bd060f98b07..612822039796739ebc1147b0073f582371b084d7 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -7,7 +7,6 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/point.h"
-#include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
@@ -26,8 +25,7 @@ class MenuRunner;
 // This class provides basic drawing and mouse-over behavior for buttons
 // appearing in the toolbar.
 class ToolbarButton : public views::LabelButton,
-                      public views::ContextMenuController,
-                      public views::InkDropHost {
+                      public views::ContextMenuController {
  public:
   // Takes ownership of the |model|, which can be null if no menu
   // is to be shown.
@@ -55,16 +53,14 @@ class ToolbarButton : public views::LabelButton,
   void OnGestureEvent(ui::GestureEvent* event) override;
   void GetAccessibleState(ui::AXViewState* state) override;
   scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override;
+  void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
+  void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
 
   // views::ContextMenuController:
   void ShowContextMenuForView(View* source,
                               const gfx::Point& point,
                               ui::MenuSourceType source_type) override;
 
-  // views::InkDropHost:
-  void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
-  void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
-
  protected:
   // views::LabelButton:
   bool ShouldEnterPushedState(const ui::Event& event) override;
@@ -79,9 +75,6 @@ class ToolbarButton : public views::LabelButton,
   // views::LabelButton:
   const char* GetClassName() const override;
 
-  // views::InkDropHost:
-  gfx::Point CalculateInkDropCenter() const override;
-
   // The associated profile. The browser theme affects rendering.
   Profile* profile_;