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

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.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 CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
 #define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h"
 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h"
 #include "chrome/browser/ui/gtk/menu_bar_helper.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/base/animation/animation.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
+#include "ui/gfx/animation/animation.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 class BookmarkBarInstructionsGtk;
 class BookmarkMenuController;
 class Browser;
 class BrowserWindowGtk;
 class GtkThemeService;
 class MenuGtk;
 class TabstripOriginProvider;
 
 namespace content {
 class PageNavigator;
 }
 
-class BookmarkBarGtk : public ui::AnimationDelegate,
+class BookmarkBarGtk : public gfx::AnimationDelegate,
                        public BookmarkModelObserver,
                        public MenuBarHelper::Delegate,
                        public content::NotificationObserver,
                        public BookmarkBarInstructionsDelegate,
                        public BookmarkContextMenuControllerDelegate {
  public:
   BookmarkBarGtk(BrowserWindowGtk* window,
                  Browser* browser,
                  TabstripOriginProvider* tabstrip_origin_provider);
   virtual ~BookmarkBarGtk();
@@ skipping 14 matching lines @@
   // Changes the state of the bookmark bar.
   void SetBookmarkBarState(BookmarkBar::State state,
                            BookmarkBar::AnimateChangeType animate_type);
 
   // Get the current height of the bookmark bar.
   int GetHeight();
 
   // Returns true if the bookmark bar is showing an animation.
   bool IsAnimating();
 
-  // ui::AnimationDelegate implementation --------------------------------------
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate implementation -------------------------------------
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   // MenuBarHelper::Delegate implementation ------------------------------------
   virtual void PopupForButton(GtkWidget* button) OVERRIDE;
   virtual void PopupForButtonNextTo(GtkWidget* button,
                                     GtkMenuDirectionType dir) OVERRIDE;
 
   // BookmarkContextMenuController::Delegate implementation --------------------
   virtual void CloseMenu() OVERRIDE;
 
-  const ui::Animation* animation() { return &slide_animation_; }
+  const gfx::Animation* animation() { return &slide_animation_; }
 
   int max_height() const { return max_height_; }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty);
   FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest,
                            HidesHelpMessageWithBookmark);
   FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, BuildsButtons);
 
   // Change the visibility of the bookmarks bar. (Starts out hidden, per GTK's
@@ skipping 282 matching lines @@
   // displayed yet.
   // The controller.
   scoped_ptr<BookmarkContextMenuController> current_context_menu_controller_;
   // The view.
   scoped_ptr<MenuGtk> current_context_menu_;
 
   // The last displayed left click menu, or NULL if no menus have been
   // displayed yet.
   scoped_ptr<BookmarkMenuController> current_menu_;
 
-  ui::SlideAnimation slide_animation_;
+  gfx::SlideAnimation slide_animation_;
 
   // Used to optimize out |bookmark_toolbar_| size-allocate events we don't
   // need to respond to.
   int last_allocation_width_;
 
   content::NotificationRegistrar registrar_;
 
   // The size of the web contents last time we forced a paint. We keep track
   // of this so we don't force too many paints.
   gfx::Size last_web_contents_size_;
@@ skipping 16 matching lines @@
 
   BookmarkBar::State bookmark_bar_state_;
 
   // Maximum height of the bookmark bar.
   int max_height_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_