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

ui/views/bubble/bubble_delegate.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 UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 
 #include "base/gtest_prod_util.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace gfx {
 class Rect;
-}
-
-namespace ui {
 class SlideAnimation;
 }
 
 namespace views {
 
 class BubbleFrameView;
 
 // BubbleDelegateView creates frame and client views for bubble Widgets.
 // BubbleDelegateView itself is the client's contents view.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
-                                        public ui::AnimationDelegate,
+                                        public gfx::AnimationDelegate,
                                         public WidgetObserver {
  public:
   BubbleDelegateView();
   BubbleDelegateView(View* anchor_view, BubbleBorder::Arrow arrow);
   virtual ~BubbleDelegateView();
 
   // Create and initialize the bubble Widget(s) with proper bounds.
   static Widget* CreateBubble(BubbleDelegateView* bubble_delegate);
 
   // WidgetDelegate overrides:
@@ skipping 87 matching lines @@
   // Get bubble bounds from the anchor rect and client view's preferred size.
   virtual gfx::Rect GetBubbleBounds();
 
   // Returns the duration in milliseconds for the fade animation.
   virtual int GetFadeDuration();
 
   // View overrides:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
 
-  // ui::AnimationDelegate overrides:
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate overrides:
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   // Perform view initialization on the contents for bubble sizing.
   virtual void Init();
 
   // Set the anchor view or rect; set these before CreateBubble or Show.
   void set_anchor_view(View* anchor_view) { anchor_view_ = anchor_view; }
   void set_anchor_rect(const gfx::Rect& rect) { anchor_rect_ = rect; }
 
   // Resize and potentially move the bubble to fit the content's preferred size.
   void SizeToContents();
 
   BubbleFrameView* GetBubbleFrameView() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CreateDelegate);
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, NonClientHitTest);
 
   // Update the bubble color from |theme|, unless it was explicitly set.
   void UpdateColorsFromTheme(const ui::NativeTheme* theme);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Get bounds for the Windows-only widget that hosts the bubble's contents.
   gfx::Rect GetBubbleClientBounds() const;
 #endif
 
   // Handles widget visibility changes.
   void HandleVisibilityChanged(Widget* widget, bool visible);
 
   // Fade animation for bubble.
-  scoped_ptr<ui::SlideAnimation> fade_animation_;
+  scoped_ptr<gfx::SlideAnimation> fade_animation_;
 
   // Flags controlling bubble closure on the escape key and deactivation.
   bool close_on_esc_;
   bool close_on_deactivate_;
 
   // The view and widget to which this bubble is anchored.
   View* anchor_view_;
   Widget* anchor_widget_;
 
   // The anchor rect used in the absence of an anchor view.
@@ skipping 37 matching lines @@
 
   // Parent native window of the bubble.
   gfx::NativeView parent_window_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_