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"
@@ skipping 254 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);
+  if (ink_drop_delegate_)
+    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 67 matching lines @@
         aura::client::GetCaptureClient(root_window);
     aura::Window* capture_window =
         capture_client ? capture_client->GetGlobalCaptureWindow() : nullptr;
     check_mouse_position = !capture_window || capture_window == root_window;
   }
 #endif
 
   return check_mouse_position && IsMouseHovered();
 }
 
+void CustomButton::set_ink_drop_delegate(InkDropDelegate* ink_drop_delegate) {
+  ink_drop_delegate_.reset(ink_drop_delegate);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides (protected):
 
+void CustomButton::OnBoundsChanged(const gfx::Rect& previous_bounds) {
+  if (ink_drop_delegate_)

[bruthig, 2015/11/26 21:27:33]

Correct me if I'm wrong but the intent here was to set the ink drop centre in
the OnBoundsChange() event, at the request of sadrul@ right?  And the
CustomButton::Layout() method should be removed then?

I tried removing CustomButton::Layout() and noticed that the ripple is
incorrectly centered on the BackButton.  The problem is that the
BackButton->SetLeadingMargin() does not trigger an OnBoundsChange() event.  And
it just so happens that BackButton::SetBounds() is called before
BackButton::SetLeadingMargin() in ToolbarView and thus the ripple will actually
be in the wrong place every time.

[varkha, 2015/11/26 22:12:40]

I have restored override of Layout(). Can you see if this works?

+    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