Pushed InkDropHost inheritence up to CustomButton.

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

Index: chrome/browser/ui/views/toolbar/app_menu_button.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.cc b/chrome/browser/ui/views/toolbar/app_menu_button.cc
index 984bac97622c429a1380c7d102be1e323d6f79ca..17a3851f4a899af6f7e41ddc1ff24d7f74db95dd 100644
--- a/chrome/browser/ui/views/toolbar/app_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu_button.cc
@@ -187,21 +187,15 @@ void AppMenuButton::SetTrailingMargin(int margin) {
 }
 
 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 {