Refactoring to make adding ink drop animations easier

ui/views/controls/button/menu_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/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using base::TimeTicks;
 using base::TimeDelta;
 
@@ skipping 88 matching lines @@
     // to NULL.
     static_cast<internal::RootView*>(GetWidget()->GetRootView())->
         SetMouseHandler(NULL);
 
     bool destroyed = false;
     destroyed_flag_ = &destroyed;
 
     // We don't set our state here. It's handled in the MenuController code or
     // by our click listener.
 
+    GetInkDropDelegate()->OnAction(InkDropState::QUICK_ACTION);
     listener_->OnMenuButtonClicked(this, menu_position);
 
     if (destroyed) {
       // The menu was deleted while showing. Don't attempt any processing.
       return false;
     }
 
     destroyed_flag_ = NULL;
 
     menu_closed_time_ = TimeTicks::Now();
 
     // We must return false here so that the RootView does not get stuck
     // sending all mouse pressed events to us instead of the appropriate
     // target.
     return false;
   }
   return true;
 }
 
-void MenuButton::WillNotActivate() {
-  if (listener_) {
-    listener_->OnMenuButtonClickCanceled(this);
-  }
-}
-
 void MenuButton::OnPaint(gfx::Canvas* canvas) {
   LabelButton::OnPaint(canvas);
 
   if (show_menu_marker_)
     PaintMenuMarker(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Events
@@ skipping 24 matching lines @@
       return Activate();
   }
   return true;
 }
 
 void MenuButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (state() != STATE_DISABLED && ShouldEnterPushedState(event) &&
       HitTestPoint(event.location()) && !InDrag()) {
     Activate();
   } else {
-    WillNotActivate();
+    GetInkDropDelegate()->OnAction(InkDropState::HIDDEN);
     LabelButton::OnMouseReleased(event);
   }
 }
 
 void MenuButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (pressed_lock_count_ == 0)  // Ignore mouse movement if state is locked.
     LabelButton::OnMouseEntered(event);
 }
 
 void MenuButton::OnMouseExited(const ui::MouseEvent& event) {
@@ skipping 153 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views