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

chrome/browser/ui/views/fullscreen_exit_bubble_views.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_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/views/widget/widget_observer.h"
 
 class BrowserView;
 class GURL;
-namespace ui {
+namespace gfx {
 class SlideAnimation;
 }
 namespace views {
 class View;
 class Widget;
 }
 
 // FullscreenExitBubbleViews is responsible for showing a bubble atop the
 // screen in fullscreen mode, telling users how to exit and providing a click
 // target. The bubble auto-hides, and re-shows when the user moves to the
@@ skipping 28 matching lines @@
   // fullscreen.
   void UpdateForImmersiveState();
 
   // Updates |popup|'s bounds given |animation_| and |animated_attribute_|.
   void UpdateBounds();
 
   // Returns the root view containing |browser_view_|.
   views::View* GetBrowserRootView() const;
 
   // FullScreenExitBubble overrides:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
   virtual gfx::Rect GetPopupRect(bool ignore_animation_state) const OVERRIDE;
   virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
   virtual bool WindowContainsPoint(gfx::Point pos) OVERRIDE;
   virtual bool IsWindowActive() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual bool IsAnimating() OVERRIDE;
   virtual bool CanMouseTriggerSlideIn() const OVERRIDE;
 
   // content::NotificationObserver override:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // views::WidgetObserver override:
   virtual void OnWidgetVisibilityChanged(views::Widget* widget,
                                          bool visible) OVERRIDE;
 
   BrowserView* browser_view_;
 
   views::Widget* popup_;
 
   // Animation controlling showing/hiding of the exit bubble.
-  scoped_ptr<ui::SlideAnimation> animation_;
+  scoped_ptr<gfx::SlideAnimation> animation_;
 
   // Attribute animated by |animation_|.
   AnimatedAttribute animated_attribute_;
 
   // The contents of the popup.
   FullscreenExitView* view_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenExitBubbleViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_