Pushed InkDropHost inheritence up to CustomButton.

ui/views/controls/button/custom_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/animation/animation_delegate.h"
+#include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/animation/ink_drop_state.h"
 #include "ui/views/controls/button/button.h"
 
 namespace gfx {
 class ThrobAnimation;
 }
 
 namespace views {
 
 class InkDropDelegate;
 
 // A button with custom rendering. The base of ImageButton and LabelButton.
 // Note that this type of button is not focusable by default and will not be
 // part of the focus chain.  Call SetFocusable(true) to make it part of the
 // focus chain.
 class VIEWS_EXPORT CustomButton : public Button,
-                                  public gfx::AnimationDelegate {
+                                  public gfx::AnimationDelegate,
+                                  public views::InkDropHost {
  public:
   // An enum describing the events on which a button should notify its listener.
   enum NotifyAction {
     NOTIFY_ON_PRESS,
     NOTIFY_ON_RELEASE,
   };
 
   // The menu button's class name.
   static const char kViewClassName[];
 
@@ skipping 57 matching lines @@
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   void ShowContextMenu(const gfx::Point& p,
                        ui::MenuSourceType source_type) override;
   void OnDragDone() override;
   void GetAccessibleState(ui::AXViewState* state) override;
   void VisibilityChanged(View* starting_from, bool is_visible) override;
 
   // Overridden from gfx::AnimationDelegate:
   void AnimationProgressed(const gfx::Animation* animation) override;
 
+  // Overridden from views::InkDropHost:
+  gfx::Point CalculateInkDropCenter() const override;
+
  protected:
   // Construct the Button with a Listener. See comment for Button's ctor.
   explicit CustomButton(ButtonListener* listener);
 
   // Invoked from SetState() when SetState() is passed a value that differs from
   // the current state. CustomButton's implementation of StateChanged() does
   // nothing; this method is provided for subclasses that wish to do something
   // on state changes.
   virtual void StateChanged();
 
@@ skipping 71 matching lines @@
   // The animation action to trigger on the |ink_drop_delegate_| when the button
   // is clicked.
   InkDropState ink_drop_action_on_click_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_