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

chrome/browser/ui/views/info_bubble.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_UI_VIEWS_INFO_BUBBLE_H_
 #define CHROME_BROWSER_UI_VIEWS_INFO_BUBBLE_H_
 #pragma once
 
-#include "app/animation_delegate.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/animation/animation_delegate.h"
 #include "views/accelerator.h"
 #include "views/view.h"
 #include "chrome/browser/views/bubble_border.h"
 
 #if defined(OS_WIN)
 #include "views/widget/widget_win.h"
 #elif defined(OS_LINUX)
 #include "views/widget/widget_gtk.h"
 #endif
 
 // InfoBubble is used to display an arbitrary view above all other windows.
 // Think of InfoBubble as a tooltip that allows you to embed an arbitrary view
 // in the tooltip. Additionally the InfoBubble renders an arrow pointing at
 // the region the info bubble is providing the information about.
 //
 // To use an InfoBubble, invoke Show() and it'll take care of the rest.  The
 // InfoBubble insets the contents for you, so the contents typically shouldn't
 // have any additional margins.
 
+#if defined(OS_WIN)
+class BorderWidget;
+#endif
 class InfoBubble;
+
+namespace gfx {
+class Path;
+}
+
+namespace ui {
 class SlideAnimation;
+}
 
 namespace views {
 class Widget;
 }
 
-namespace gfx {
-class Path;
-}
-
-#if defined(OS_WIN)
-class BorderWidget;
-#endif
-
 // This is used to paint the border of the InfoBubble.  Windows uses this via
 // BorderWidget (see below), while others can use it directly in the bubble.
 class BorderContents : public views::View {
  public:
   BorderContents() : bubble_border_(NULL) { }
 
   // Must be called before this object can be used.
   void Init();
 
   // Given the size of the contents and the rect to point at, returns the bounds
@@ skipping 120 matching lines @@
 // TODO(sky): this code is ifdef-tastic. It might be cleaner to refactor the
 // WidgetFoo subclass into a separate class that calls into InfoBubble.
 // That way InfoBubble has no (or very few) ifdefs.
 class InfoBubble
 #if defined(OS_WIN)
     : public views::WidgetWin,
 #elif defined(OS_LINUX)
     : public views::WidgetGtk,
 #endif
       public views::AcceleratorTarget,
-      public AnimationDelegate {
+      public ui::AnimationDelegate {
  public:
   // Shows the InfoBubble.  |parent| is set as the parent window, |contents| are
   // the contents shown in the bubble, and |position_relative_to| is a rect in
   // screen coordinates at which the InfoBubble will point.  Show() takes
   // ownership of |contents| and deletes the created InfoBubble when another
   // window is activated.  You can explicitly close the bubble by invoking
   // Close(). |arrow_location| specifies preferred bubble alignment.
   // You may provide an optional |delegate| to:
   //     - Be notified when the InfoBubble is closed.
   //     - Prevent the InfoBubble from being closed when the Escape key is
@@ skipping 26 matching lines @@
   // we use FadeOut when the user selects something within the bubble that
   // causes the bubble to dismiss. We don't use it when the bubble gets
   // deactivated as a result of clicking outside the bubble.
   void set_fade_away_on_close(bool fade_away_on_close) {
     fade_away_on_close_ = fade_away_on_close;
   }
 
   // Overridden from WidgetWin:
   virtual void Close();
 
-  // Overridden from AnimationDelegate:
-  virtual void AnimationEnded(const Animation* animation);
-  virtual void AnimationProgressed(const Animation* animation);
+  // Overridden from ui::AnimationDelegate:
+  virtual void AnimationEnded(const ui::Animation* animation);
+  virtual void AnimationProgressed(const ui::Animation* animation);
 
   static const SkColor kBackgroundColor;
 
  protected:
   InfoBubble();
 #if defined(OS_CHROMEOS)
   InfoBubble(views::WidgetGtk::Type type, bool show_while_screen_is_locked);
 #endif
   virtual ~InfoBubble();
 
@@ skipping 43 matching lines @@
   // Animates to a visible/hidden state (visible if |fade_in| is true).
   void Fade(bool fade_in);
 
   // Overridden from AcceleratorTarget:
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
 
   // The delegate, if any.
   InfoBubbleDelegate* delegate_;
 
   // The animation used to fade the bubble out.
-  scoped_ptr<SlideAnimation> animation_;
+  scoped_ptr<ui::SlideAnimation> animation_;
 
   // The current visibility status of the bubble.
   ShowStatus show_status_;
 
   // Whether to fade away when the bubble closes.
   bool fade_away_on_close_;
 
 #if defined(OS_CHROMEOS)
   // Should we set a property telling the window manager to show this window
   // onscreen even when the screen is locked?
   bool show_while_screen_is_locked_;
 #endif
 
   gfx::Rect position_relative_to_;
   BubbleBorder::ArrowLocation arrow_location_;
 
   views::View* contents_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBubble);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFO_BUBBLE_H_