Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

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/animation/ink_drop_state.h"
 #include "ui/views/controls/button/button.h"
 
 namespace gfx {
 class ThrobAnimation;
 }
 
 namespace views {
 
 class InkDropDelegate;
 
@@ skipping 92 matching lines @@
 
   // Returns true if the event is one that can trigger notifying the listener.
   // This implementation returns true if the left mouse button is down.
   virtual bool IsTriggerableEvent(const ui::Event& event);
 
   // Returns true if the button should become pressed when the user
   // holds the mouse down over the button. For this implementation,
   // we simply return IsTriggerableEvent(event).
   virtual bool ShouldEnterPushedState(const ui::Event& event);
 
+  void set_has_ink_drop_action_on_click(bool has_ink_drop_action_on_click) {
+    has_ink_drop_action_on_click_ = has_ink_drop_action_on_click;
+  }
+
+  void set_ink_drop_action_on_click(InkDropState ink_drop_state) {
+    ink_drop_action_on_click_ = ink_drop_state;
+  }

[sadrul, 2015/12/21 22:24:35]

It doesn't look like this is actually ever used?

[bruthig, 2015/12/22 16:49:17]

I expect it to be used by buttons that would like to use something other than
the QUICK_ACTION state for a button click. More concretely there is work going
on to make menu shows asynchronous.  I expect these buttons to use this function
to set the click action to ACTIVATED once the dust has settled.

Would you rather I omit it for now?

[sadrul, 2015/12/22 22:34:35]

Yeah, let's remove that until we need it.

[bruthig, 2015/12/22 23:10:15]

Done.

+
   // 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();
 
   InkDropDelegate* ink_drop_delegate() const { return ink_drop_delegate_; }
   void set_ink_drop_delegate(InkDropDelegate* ink_drop_delegate) {
     ink_drop_delegate_ = ink_drop_delegate;
   }
 
   // Overridden from View:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   void OnBlur() override;
 
+  // Overridden from Button:
+  void NotifyClick(const ui::Event& event) override;
+  void OnClickCanceled(const ui::Event& event) 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.
@@ skipping 12 matching lines @@
   bool request_focus_on_press_;
 
   // Animation delegate for the ink drop ripple effect. It is owned by a
   // descendant class and needs to be reset before an instance of the concrete
   // CustomButton is destroyed.
   InkDropDelegate* ink_drop_delegate_;
 
   // The event on which the button should notify its listener.
   NotifyAction notify_action_;
 
+  // True when a button click should trigger an animation action on
+  // |ink_drop_delegate_|.
+  bool has_ink_drop_action_on_click_;
+
+  // The animation action to trigger on the |ink_drop_delegate_| when the button
+  // is clicked.
+  InkDropState ink_drop_action_on_click_;

[sadrul, 2015/12/21 22:24:35]

Can there be an InkDropState::NONE, instead of having a separate bool?

[bruthig, 2015/12/22 16:49:18]

There are plans to add an InkDropDelegate::InkDropAction enum that will be used
here instead.  The InkDropAction enum will have a NONE value and we will be able
to drop this flag.  I've added TODO's to track this work.

+
   DISALLOW_COPY_AND_ASSIGN(CustomButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_