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

chrome/browser/ui/views/toolbar/app_menu_button.h

 // Copyright 2013 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 CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/toolbar/app_menu_icon_painter.h"
 #include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 class AppMenu;
 class AppMenuModel;
 
 namespace views {
-class InkDropAnimationController;
+class InkDropDelegate;
 class LabelButtonBorder;
 class MenuListener;
 }
 
 class ToolbarView;
 
 class AppMenuButton : public views::InkDropHost,
                       public views::MenuButton,
                       public AppMenuIconPainter::Delegate {
  public:
@@ skipping 46 matching lines @@
 
   // views::MenuButton:
   const char* GetClassName() const override;
   scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override;
   gfx::Rect GetThemePaintRect() const override;
   bool GetDropFormats(
       int* formats,
       std::set<ui::Clipboard::FormatType>* format_types) override;
   bool AreDropTypesRequired() override;
   bool CanDrop(const ui::OSExchangeData& data) override;
-  void Layout() override;
   void OnDragEntered(const ui::DropTargetEvent& event) override;
   int OnDragUpdated(const ui::DropTargetEvent& event) override;
   void OnDragExited() override;
   int OnPerformDrop(const ui::DropTargetEvent& event) override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // Only used in pre-MD.
   scoped_ptr<AppMenuIconPainter> icon_painter_;
 
   // Only used in MD.
   AppMenuIconPainter::Severity severity_;
 
-  // Animation controller for the ink drop ripple effect.
-  scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
-
   // Our owning toolbar view.
   ToolbarView* toolbar_view_;
 
   // Whether or not we should allow dragging extension icons onto this button
   // (in order to open the overflow in the app menu).
   bool allow_extension_dragging_;
 
   // Listeners to call when the menu opens.
   base::ObserverList<views::MenuListener> menu_listeners_;
 
   // App model and menu.
   // Note that the menu should be destroyed before the model it uses, so the
   // menu should be listed later.
   scoped_ptr<AppMenuModel> menu_model_;
   scoped_ptr<AppMenu> menu_;
 
   // Used by ShowMenu() to detect when |this| has been deleted; see comments
   // there.
   bool* destroyed_;
 
   // Any trailing margin to be applied. Used when the browser is in
   // a maximized state to extend to the full window width.
   int margin_trailing_;
 
+  // Controls the visual feedback for the button state.
+  scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
+
   // Used to spawn weak pointers for delayed tasks to open the overflow menu.
   base::WeakPtrFactory<AppMenuButton> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppMenuButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_