Pushed InkDropHost inheritence up to CustomButton.

chrome/browser/ui/views/toolbar/app_menu_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/app_menu_button.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
@@ skipping 169 matching lines @@
 
   UpdateThemedBorder();
 
   const int inset = LabelButton::kFocusRectInset;
   SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets(
       gfx::Insets(inset, inset, inset, inset + margin)));
   InvalidateLayout();
 }
 
 void AppMenuButton::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);
+  views::MenuButton::AddInkDropLayer(ink_drop_layer);
 }
 
 void AppMenuButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
-  layer()->Remove(ink_drop_layer);
-
+  views::MenuButton::RemoveInkDropLayer(ink_drop_layer);
   image()->SetFillsBoundsOpaquely(true);
   image()->SetPaintToLayer(false);
-  SetPaintToLayer(false);
 }
 
 gfx::Point AppMenuButton::CalculateInkDropCenter() const {
   // ToolbarView extends the bounds of the app button to the right in maximized
   // mode. So instead of using the center point of local bounds, we use the
   // center point (adjusted for RTL layouts) of the preferred size, which
   // doesn't change in maximized mode.
   const int visible_width = GetPreferredSize().width();
   return gfx::Point(
       (GetMirroredXWithWidthInView(0, visible_width) + visible_width) / 2,
@@ skipping 78 matching lines @@
   views::MenuButton::OnPaint(canvas);
   if (ui::MaterialDesignController::IsModeMaterial())
     return;
   // Use GetPreferredSize() to center the icon inside the visible bounds rather
   // than the whole size() (which may refer to hit test region extended to the
   // end of the toolbar in maximized mode).
   icon_painter_->Paint(canvas, GetThemeProvider(),
                        gfx::Rect(GetPreferredSize()),
                        AppMenuIconPainter::BEZEL_NONE);
 }