Move animation code to new ui/base/animation directory....

chrome/browser/gtk/bookmark_bar_gtk.h

 // Copyright (c) 2010 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_GTK_BOOKMARK_BAR_GTK_H_
 #define CHROME_BROWSER_GTK_BOOKMARK_BAR_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
-#include "app/animation_delegate.h"
 #include "app/gtk_signal.h"
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/gtk/bookmark_bar_instructions_gtk.h"
 #include "chrome/browser/gtk/menu_bar_helper.h"
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/point.h"
 #include "gfx/size.h"
+#include "ui/base/animation/animation_delegate.h"
 
 class BookmarkMenuController;
 class Browser;
 class BrowserWindowGtk;
 class CustomContainerButton;
 class GtkThemeProvider;
 class MenuGtk;
 class PageNavigator;
 class Profile;
-class SlideAnimation;
 class TabstripOriginProvider;
 
-class BookmarkBarGtk : public AnimationDelegate,
+namespace ui {
+class SlideAnimation;
+}
+
+class BookmarkBarGtk : public ui::AnimationDelegate,
                        public ProfileSyncServiceObserver,
                        public BookmarkModelObserver,
                        public MenuBarHelper::Delegate,
                        public NotificationObserver,
                        public BookmarkBarInstructionsGtk::Delegate,
                        public BookmarkContextMenuControllerDelegate {
  public:
   BookmarkBarGtk(BrowserWindowGtk* window,
                  Profile* profile,
                  Browser* browser,
@@ skipping 38 matching lines @@
 
   // Get the current height of the bookmark bar.
   int GetHeight();
 
   // Returns true if the bookmark bar is showing an animation.
   bool IsAnimating();
 
   // Returns true if the bookmarks bar preference is set to 'always show'.
   bool IsAlwaysShown();
 
-  // AnimationDelegate implementation ------------------------------------------
-  virtual void AnimationProgressed(const Animation* animation);
-  virtual void AnimationEnded(const Animation* animation);
+  // ui::AnimationDelegate implementation ------------------------------------------
+  virtual void AnimationProgressed(const ui::Animation* animation);
+  virtual void AnimationEnded(const ui::Animation* animation);
 
   // MenuBarHelper::Delegate implementation ------------------------------------
   virtual void PopupForButton(GtkWidget* button);
   virtual void PopupForButtonNextTo(GtkWidget* button,
                                     GtkMenuDirectionType dir);
 
   // The NTP needs to have access to this.
   static const int kBookmarkBarNTPHeight;
 
   // BookmarkContextMenuController::Delegate implementation --------------------
@@ skipping 248 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_;
 
-  scoped_ptr<SlideAnimation> slide_animation_;
+  scoped_ptr<ui::SlideAnimation> slide_animation_;
 
   // Whether we are currently configured as floating (detached from the
   // toolbar). This reflects our actual state, and can be out of sync with
   // what ShouldShowFloating() returns.
   bool floating_;
 
   // Used to optimize out |bookmark_toolbar_| size-allocate events we don't
   // need to respond to.
   int last_allocation_width_;
 
   NotificationRegistrar registrar_;
 
   // The size of the tab contents last time we forced a paint. We keep track
   // of this so we don't force too many paints.
   gfx::Size last_tab_contents_size_;
 
   // The last coordinates recorded by OnButtonPress; used to line up the
   // drag icon during bookmark drags.
   gfx::Point last_pressed_coordinates_;
 
   // The currently throbbing widget. This is NULL if no widget is throbbing.
   // We track it because we only want to allow one widget to throb at a time.
   GtkWidget* throbbing_widget_;
 
   ScopedRunnableMethodFactory<BookmarkBarGtk> method_factory_;
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_BAR_GTK_H_