Refactoring to make adding ink drop animations easier

ui/views/controls/button/custom_button.h

Index: ui/views/controls/button/custom_button.h
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
index 869bcd77af5dac05115312e726c984cf58aac1cf..a70d867e0da845f8269d95f13a50e1a178c803a6 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -16,6 +16,8 @@ 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
@@ -124,16 +126,24 @@ class VIEWS_EXPORT CustomButton : public Button,
   bool ShouldEnterHoveredState();
 
   // Overridden from View:
+  void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   void OnBlur() override;
 
+  InkDropDelegate* ink_drop_delegate() const {
+    return ink_drop_delegate_.get();
+  }

[sadrul, 2015/11/25 22:38:58]

non-overrides before overrides. So this should move up

[varkha, 2015/11/26 00:05:47]

Done.

+
   // The button state (defined in implementation)
   ButtonState state_;
 
   // Hover animation.
   scoped_ptr<gfx::ThrobAnimation> hover_animation_;
 
+  // Animation delegate for the ink drop ripple effect.
+  scoped_ptr<InkDropDelegate> ink_drop_delegate_;

[sadrul, 2015/11/25 22:38:58]

Should be a private member.

[varkha, 2015/11/26 00:05:47]

Done.

+
  private:
   // Returns true if this is not a top level widget. Virtual for tests.
   virtual bool IsChildWidget() const;