Pushed InkDropHost inheritence up to CustomButton.

chrome/browser/ui/views/bar_control_button.cc

 // Copyright 2015 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/bar_control_button.h"
 
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
@@ skipping 43 matching lines @@
   gfx::ImageSkia image = gfx::CreateVectorIcon(id_, 16, icon_color);
   SetImage(views::CustomButton::STATE_NORMAL, &image);
   image = gfx::CreateVectorIcon(id_, 16, SkColorSetA(icon_color, 0xff / 2));
   SetImage(views::CustomButton::STATE_DISABLED, &image);
 }
 
 void BarControlButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   OnThemeChanged();
 }
 
-void BarControlButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {
-  // TODO(estade|tdanderson): The ink drop layer should be positioned behind
-  //                          the button's image.
-  SetPaintToLayer(true);
-  SetFillsBoundsOpaquely(false);
-  layer()->Add(ink_drop_layer);
-  layer()->StackAtBottom(ink_drop_layer);
-}
-
-void BarControlButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
-  layer()->Remove(ink_drop_layer);
-  SetFillsBoundsOpaquely(true);
-  SetPaintToLayer(false);
-}
-
-gfx::Point BarControlButton::CalculateInkDropCenter() const {
-  return GetLocalBounds().CenterPoint();
-}
-
 bool BarControlButton::OnMousePressed(const ui::MouseEvent& event) {
   if (IsTriggerableEvent(event))
     ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
 
   return ImageButton::OnMousePressed(event);
 }