Pushed InkDropHost inheritence up to CustomButton.

ui/views/controls/button/image_button.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/image_button.h"
 
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 90 matching lines @@
 }
 
 const char* ImageButton::GetClassName() const {
   return kViewClassName;
 }
 
 void ImageButton::OnPaint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::OnPaint(canvas);
 
+  // TODO(estade|tdanderson|bruthig): The ink drop layer should be positioned
+  // behind the button's image which means the image needs to be painted to its
+  // own layer instead of to the Canvas.
   gfx::ImageSkia img = GetImageToPaint();
 
   if (!img.isNull()) {
     gfx::ScopedCanvas scoped(canvas);
     if (draw_image_mirrored_) {
       canvas->Translate(gfx::Vector2d(width(), 0));
       canvas->Scale(-1, 1);
     }
 
     gfx::Point position = ComputeImagePaintPosition(img);
@@ skipping 140 matching lines @@
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 void ToggleImageButton::GetAccessibleState(ui::AXViewState* state) {
   ImageButton::GetAccessibleState(state);
   GetTooltipText(gfx::Point(), &state->name);
 }
 
 }  // namespace views