Refactoring to make adding ink drop animations easier

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/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/animation/animation_delegate.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:
   // An enum describing the events on which a button should notify its listener.
   enum NotifyAction {
     NOTIFY_ON_PRESS,
@@ skipping 40 matching lines @@
 
   // Sets the event on which the button should notify its listener.
   void set_notify_action(NotifyAction notify_action) {
     notify_action_ = notify_action;
   }
 
   void SetHotTracked(bool is_hot_tracked);
   bool IsHotTracked() const;
 
   // Overridden from View:
+  void Layout() override;
   void OnEnabledChanged() override;
   const char* GetClassName() const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
   void OnMouseCaptureLost() override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void OnMouseMoved(const ui::MouseEvent& event) override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
@@ skipping 27 matching lines @@
   // holds the mouse down over the button. For this implementation,
   // we simply return IsTriggerableEvent(event).
   virtual bool ShouldEnterPushedState(const ui::Event& event);
 
   // Returns true if the button should enter hovered state; that is, if the
   // mouse is over the button, and no other window has capture (which would
   // prevent the button from receiving MouseExited events and updating its
   // state). This does not take into account enabled state.
   bool ShouldEnterHoveredState();
 
+  void set_ink_drop_delegate(InkDropDelegate* ink_drop_delegate);

[sadrul, 2015/11/27 05:59:35]

SetInkDropDelegate(scoped_ptr<...>)

to clarify the ownership transfer with the call.

[varkha, 2015/11/27 15:17:02]

Done.

+  InkDropDelegate* ink_drop_delegate() const {
+    return ink_drop_delegate_.get();
+  }
+
   // Overridden from View:
+  void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   void OnBlur() override;
 
   // The button state (defined in implementation)
   ButtonState state_;
 
   // Hover animation.
   scoped_ptr<gfx::ThrobAnimation> hover_animation_;
 
  private:
   // Returns true if this is not a top level widget. Virtual for tests.
   virtual bool IsChildWidget() const;
   // Returns true if the focus is not in a top level widget. Virtual for tests.
   virtual bool FocusInChildWidget() const;
 
   // Should we animate when the state changes? Defaults to true.
   bool animate_on_state_change_;
 
   // Is the hover animation running because StartThrob was invoked?
   bool is_throbbing_;
 
   // Mouse event flags which can trigger button actions.
   int triggerable_event_flags_;
 
   // See description above setter.
   bool request_focus_on_press_;
 
+  // Animation delegate for the ink drop ripple effect.
+  scoped_ptr<InkDropDelegate> ink_drop_delegate_;
+
   // The event on which the button should notify its listener.
   NotifyAction notify_action_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_