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"
@@ skipping 119 matching lines @@
   InkDropDelegate* ink_drop_delegate() const {
     return ink_drop_delegate_.get();
   }
 
   // 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 16 matching lines @@
 
   // The event on which the button should notify its listener.
   NotifyAction notify_action_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_