Pushed InkDropHost inheritence up to CustomButton.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 155 matching lines @@
 ToolbarButton::CreateDefaultBorder() const {
   scoped_ptr<views::LabelButtonBorder> border =
       views::LabelButton::CreateDefaultBorder();
 
   if (ThemeServiceFactory::GetForProfile(profile_)->UsingSystemTheme())
     border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON));
 
   return border.Pass();
 }
 
-void ToolbarButton::ShowContextMenuForView(View* source,
-                                           const gfx::Point& point,
-                                           ui::MenuSourceType source_type) {
-  if (!enabled())
-    return;
-
-  show_menu_factory_.InvalidateWeakPtrs();
-  ShowDropDownMenu(source_type);
-}
-
 void ToolbarButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
   image()->SetPaintToLayer(true);
   image()->SetFillsBoundsOpaquely(false);
 
   layer()->Add(ink_drop_layer);
   layer()->StackAtBottom(ink_drop_layer);
 
   // Invalidates the contents of the parent's layer which may contain
   // a stale close/reload icon that should not remain visible.
   parent()->SchedulePaint();
 }
 
 void ToolbarButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   layer()->Remove(ink_drop_layer);
 
   image()->SetFillsBoundsOpaquely(true);
   image()->SetPaintToLayer(false);
   SetPaintToLayer(false);
 }
 
+void ToolbarButton::ShowContextMenuForView(View* source,
+                                           const gfx::Point& point,
+                                           ui::MenuSourceType source_type) {
+  if (!enabled())
+    return;
+
+  show_menu_factory_.InvalidateWeakPtrs();
+  ShowDropDownMenu(source_type);
+}
+
 bool ToolbarButton::ShouldEnterPushedState(const ui::Event& event) {
   // Enter PUSHED state on press with Left or Right mouse button or on taps.
   // Remain in this state while the context menu is open.
   return event.type() == ui::ET_GESTURE_TAP ||
          event.type() == ui::ET_GESTURE_TAP_DOWN ||
          (event.IsMouseEvent() && ((ui::EF_LEFT_MOUSE_BUTTON |
              ui::EF_RIGHT_MOUSE_BUTTON) & event.flags()) != 0);
 }
 
 bool ToolbarButton::ShouldShowMenu() {
@@ skipping 76 matching lines @@
   SetMouseHandler(nullptr);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }
-
-gfx::Point ToolbarButton::CalculateInkDropCenter() const {
-  return GetLocalBounds().CenterPoint();
-}