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

chrome/browser/ui/gtk/location_bar_view_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_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
@@ skipping 11 matching lines @@
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/content_settings_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.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/base/window_open_disposition.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "url/gurl.h"
 
 class Browser;
 class CommandUpdater;
 class ContentSettingImageModel;
 class ContentSettingBubbleGtk;
 class ExtensionAction;
 class GtkThemeService;
 class OmniboxViewGtk;
 
@@ skipping 111 matching lines @@
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Edit background color.
   static const GdkColor kBackgroundColor;
 
   // Superclass for content settings icons shown at the left side of the
   // location bar.
-  class PageToolViewGtk : public ui::AnimationDelegate {
+  class PageToolViewGtk : public gfx::AnimationDelegate {
    public:
     PageToolViewGtk();
     virtual ~PageToolViewGtk();
 
     GtkWidget* widget();
 
     bool IsVisible();
 
     // Updates the decoration from the shown WebContents.
     virtual void UpdatePreLayout(content::WebContents* web_contents) = 0;
 
     // Performs any updates which depend on the image having already been laid
     // out by the owning LocationBarView.
     virtual void UpdatePostLayout(content::WebContents* web_contents) = 0;
 
-    // Overridden from ui::AnimationDelegate:
-    virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-    virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-    virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
+    // Overridden from gfx::AnimationDelegate:
+    virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+    virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+    virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE;
 
    protected:
     // Theme constants for solid background elements.
     virtual GdkColor button_border_color() const = 0;
     virtual GdkColor gradient_top_color() const = 0;
     virtual GdkColor gradient_bottom_color() const = 0;
 
     // Delegate for ButtonPressed message.
     virtual void OnClick(GtkWidget* sender) = 0;
 
     // Start the process of showing the label.
     void StartAnimating();
 
     // Slide the label shut.
     void CloseAnimation();
 
     CHROMEGTK_CALLBACK_1(PageToolViewGtk, gboolean, OnButtonPressed, GdkEvent*);
     CHROMEGTK_CALLBACK_1(PageToolViewGtk, gboolean, OnExpose, GdkEventExpose*);
 
     // The widgets for this view.
     ui::OwnedWidgetGtk alignment_;
     ui::OwnedWidgetGtk event_box_;
     GtkWidget* hbox_;
     ui::OwnedWidgetGtk image_;
 
     // Explanatory text (e.g. "popup blocked").
     ui::OwnedWidgetGtk label_;
 
     // When we show explanatory text, we slide it in/out.
-    ui::SlideAnimation animation_;
+    gfx::SlideAnimation animation_;
 
     // The label's default requisition (cached so we can animate accordingly).
     GtkRequisition label_req_;
 
     base::WeakPtrFactory<PageToolViewGtk> weak_factory_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(PageToolViewGtk);
   };
 
@@ skipping 307 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // Used to remember the URL and title text when drag&drop has begun.
   GURL drag_url_;
   string16 drag_title_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_