Refactoring to make adding ink drop animations easier

ui/views/controls/button/custom_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/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/window.h"
 #endif
 
 namespace views {
 
+namespace {
+
+// A stub InkDropDelegate implementation that always exists and does nothing.
+// A real InkDropDelegate descendant can be returned by a View's descendant via
+// GetInkDropDelegate().
+class InkDropDelegateStub : public InkDropDelegate {
+ public:
+  InkDropDelegateStub() {}
+  ~InkDropDelegateStub() override {}
+
+  // InkDropDelegate:
+  void SetInkDropSize(int large_size,
+                      int large_corner_radius,
+                      int small_size,
+                      int small_corner_radius) override {}
+  void OnBoundsChanged() override {}
+  void OnAction(InkDropState state) override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InkDropDelegateStub);
+};

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

Still not a fan of this stub. I think we should still null-check (I don't think
there will be many places that does the nullcheck, so should be ok)

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

Done.

+
 // How long the hover animation takes if uninterrupted.
 static const int kHoverFadeDurationMs = 150;
 
+}  // namespace
+
 // static
 const char CustomButton::kViewClassName[] = "CustomButton";
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, public:
 
 // static
 const CustomButton* CustomButton::AsCustomButton(const views::View* view) {
   return AsCustomButton(const_cast<views::View*>(view));
 }
@@ skipping 236 matching lines @@
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
   View::ShowContextMenu(p, source_type);
 }
 
 void CustomButton::OnDragDone() {
   // Only reset the state to normal if the button isn't currently disabled
   // (since disabled buttons may still be able to be dragged).
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
+  Button::OnDragDone();

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

Is this still needed?

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

Done.

+  ink_drop_delegate_->OnAction(InkDropState::HIDDEN);
 }
 
 void CustomButton::GetAccessibleState(ui::AXViewState* state) {
   Button::GetAccessibleState(state);
   switch (state_) {
     case STATE_HOVERED:
       state->AddStateFlag(ui::AX_STATE_HOVERED);
       break;
     case STATE_PRESSED:
       state->AddStateFlag(ui::AX_STATE_PRESSED);
@@ skipping 20 matching lines @@
 void CustomButton::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
+      ink_drop_delegate_(new InkDropDelegateStub),
       animate_on_state_change_(true),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true),
       notify_action_(NOTIFY_ON_RELEASE) {
   hover_animation_.reset(new gfx::ThrobAnimation(this));
   hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
 }
 
 void CustomButton::StateChanged() {
@@ skipping 30 matching lines @@
     check_mouse_position = !capture_window || capture_window == root_window;
   }
 #endif
 
   return check_mouse_position && IsMouseHovered();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides (protected):
 
+void CustomButton::OnBoundsChanged(const gfx::Rect& previous_bounds) {
+  ink_drop_delegate_->OnBoundsChanged();
+}
+
 void CustomButton::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (!details.is_add && state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(STATE_NORMAL);
 }
 
 bool CustomButton::IsChildWidget() const {
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views