4 files changed, 13 insertions, 11 deletions
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index 7a3eca2..baf0209 100644
--- a/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.cc
@@ -5,7 +5,7 @@
 #include "views/controls/button/custom_button.h"
 
 #include "app/keyboard_codes.h"
-#include "app/throb_animation.h"
+#include "ui/base/animation/throb_animation.h"
 #include "views/screen.h"
 
 namespace views {
@@ -120,7 +120,7 @@ CustomButton::CustomButton(ButtonListener* listener)
       is_throbbing_(false),
       triggerable_event_flags_(MouseEvent::EF_LEFT_BUTTON_DOWN),
       request_focus_on_press_(true) {
-  hover_animation_.reset(new ThrobAnimation(this));
+  hover_animation_.reset(new ui::ThrobAnimation(this));
   hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
 }
 
@@ -262,9 +262,9 @@ void CustomButton::WillLoseFocus() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// CustomButton, AnimationDelegate implementation:
+// CustomButton, ui::AnimationDelegate implementation:
 
-void CustomButton::AnimationProgressed(const Animation* animation) {
+void CustomButton::AnimationProgressed(const ui::Animation* animation) {
   SchedulePaint();
 }
 
diff --git a/views/controls/button/custom_button.h b/views/controls/button/custom_button.h
index 6e35a3f..e0dcb2b 100644
--- a/views/controls/button/custom_button.h
+++ b/views/controls/button/custom_button.h
@@ -6,10 +6,12 @@
 #define VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 #pragma once
 
-#include "app/animation_delegate.h"
 #include "views/controls/button/button.h"
+#include "ui/base/animation/animation_delegate.h"
 
+namespace ui {
 class ThrobAnimation;
+}
 
 namespace views {
 
@@ -19,7 +21,7 @@ namespace views {
 // part of the focus chain.  Call SetFocusable(true) to make it part of the
 // focus chain.
 class CustomButton : public Button,
-                     public AnimationDelegate {
+                     public ui::AnimationDelegate {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
@@ -104,8 +106,8 @@ class CustomButton : public Button,
   virtual bool IsHotTracked() const;
   virtual void WillLoseFocus();
 
-  // Overridden from AnimationDelegate:
-  virtual void AnimationProgressed(const Animation* animation);
+  // Overridden from ui::AnimationDelegate:
+  virtual void AnimationProgressed(const ui::Animation* animation);
 
   // Returns true if the button should become pressed when the user
   // holds the mouse down over the button. For this implementation,
@@ -116,7 +118,7 @@ class CustomButton : public Button,
   ButtonState state_;
 
   // Hover animation.
-  scoped_ptr<ThrobAnimation> hover_animation_;
+  scoped_ptr<ui::ThrobAnimation> hover_animation_;
 
  private:
   // Should we animate when the state changes? Defaults to true.
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 362b7abe..306633e 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -4,9 +4,9 @@
 
 #include "views/controls/button/image_button.h"
 
-#include "app/throb_animation.h"
 #include "gfx/canvas.h"
 #include "gfx/skbitmap_operations.h"
+#include "ui/base/animation/throb_animation.h"
 
 namespace views {
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 1df698a..4c3460f 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -6,11 +6,11 @@
 
 #include <algorithm>
 
-#include "app/throb_animation.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
+#include "ui/base/animation/throb_animation.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"