ui/base/animation -> ui/gfx/animation

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 9bb4a529877066b6eec656196a287f6d4033416d..c680ad8eb82230767a295f807c9ddbcca0f32396 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -63,13 +63,13 @@
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/button_drag_utils.h"
@@ -156,7 +156,7 @@ class BookmarkButtonBase : public views::TextButton {
   BookmarkButtonBase(views::ButtonListener* listener,
                      const string16& title)
       : TextButton(listener, title) {
-    show_animation_.reset(new ui::SlideAnimation(this));
+    show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
@@ -173,7 +173,7 @@ class BookmarkButtonBase : public views::TextButton {
   }
 
  private:
-  scoped_ptr<ui::SlideAnimation> show_animation_;
+  scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButtonBase);
 };
@@ -256,7 +256,7 @@ class BookmarkFolderButton : public views::MenuButton {
                        views::MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
       : MenuButton(listener, title, menu_button_listener, show_menu_marker) {
-    show_animation_.reset(new ui::SlideAnimation(this));
+    show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
@@ -292,7 +292,7 @@ class BookmarkFolderButton : public views::MenuButton {
   }
 
  private:
-  scoped_ptr<ui::SlideAnimation> show_animation_;
+  scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
@@ -928,13 +928,13 @@ void BookmarkBarView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS);
 }
 
-void BookmarkBarView::AnimationProgressed(const ui::Animation* animation) {
+void BookmarkBarView::AnimationProgressed(const gfx::Animation* animation) {
   // |browser_view_| can be NULL during tests.
   if (browser_view_)
     browser_view_->ToolbarSizeChanged(true);
 }
 
-void BookmarkBarView::AnimationEnded(const ui::Animation* animation) {
+void BookmarkBarView::AnimationEnded(const gfx::Animation* animation) {
   // |browser_view_| can be NULL during tests.
   if (browser_view_) {
     browser_view_->ToolbarSizeChanged(false);
@@ -1292,7 +1292,7 @@ void BookmarkBarView::Init() {
 
   set_context_menu_controller(this);
 
-  size_animation_.reset(new ui::SlideAnimation(this));
+  size_animation_.reset(new gfx::SlideAnimation(this));
 
   model_ = BookmarkModelFactory::GetForProfile(browser_->profile());
   if (model_) {