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

chrome/browser/ui/views/infobars/infobars.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_INFOBARS_INFOBARS_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBARS_H_
 #pragma once
 
-#include "app/animation_delegate.h"
 #include "base/task.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "ui/base/animation/animation_delegate.h"
 #include "views/controls/button/button.h"
 #include "views/controls/link.h"
 #include "views/focus/focus_manager.h"
 
 class InfoBarContainer;
+
+namespace ui {
 class SlideAnimation;
+}
+
 namespace views {
 class ExternalFocusTracker;
 class ImageButton;
 class ImageView;
 class Label;
 class NativeButton;
 }
 
 // This file contains implementations for some general purpose InfoBars. See
 // chrome/browser/tab_contents/infobar_delegate.h for the delegate interface(s)
 // that you must implement to use these.
 
 class InfoBarBackground : public views::Background {
  public:
   explicit InfoBarBackground(InfoBarDelegate::Type infobar_type);
 
   // Overridden from views::Background:
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const;
 
  private:
   scoped_ptr<views::Background> gradient_background_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarBackground);
 };
 
 class InfoBar : public views::View,
                 public views::ButtonListener,
                 public views::FocusChangeListener,
-                public AnimationDelegate {
+                public ui::AnimationDelegate {
  public:
   explicit InfoBar(InfoBarDelegate* delegate);
   virtual ~InfoBar();
 
   InfoBarDelegate* delegate() const { return delegate_; }
 
   // Set a link to the parent InfoBarContainer. This must be set before the
   // InfoBar is added to the view hierarchy.
   void set_container(InfoBarContainer* container) { container_ = container; }
 
@@ skipping 22 matching lines @@
   // Returns the available width of the View for use by child view layout,
   // excluding the close button.
   virtual int GetAvailableWidth() const;
 
   // Removes our associated InfoBarDelegate from the associated TabContents.
   // (Will lead to this InfoBar being closed).
   void RemoveInfoBar() const;
 
   void set_target_height(double height) { target_height_ = height; }
 
-  SlideAnimation* animation() { return animation_.get(); }
+  ui::SlideAnimation* animation() { return animation_.get(); }
 
   // Returns a centered y-position of a control of height specified in
   // |prefsize| within the standard InfoBar height. Stable during an animation.
   int CenterY(const gfx::Size prefsize);
 
   // Returns a centered y-position of a control of height specified in
   // |prefsize| within the standard InfoBar height, adjusted according to the
   // current amount of animation offset the |parent| InfoBar currently has.
   // Changes during an animation.
   int OffsetY(views::View* parent, const gfx::Size prefsize);
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // Overridden from views::FocusChangeListener:
   virtual void FocusWillChange(View* focused_before, View* focused_now);
 
-  // Overridden from AnimationDelegate:
-  virtual void AnimationProgressed(const Animation* animation);
-  virtual void AnimationEnded(const Animation* animation);
+  // Overridden from ui::AnimationDelegate:
+  virtual void AnimationProgressed(const ui::Animation* animation);
+  virtual void AnimationEnded(const ui::Animation* animation);
 
  private:
   friend class InfoBarContainer;
 
   // Starts animating the InfoBar open.
   void AnimateOpen();
 
   // Opens the InfoBar immediately.
   void Open();
 
@@ skipping 23 matching lines @@
   // The InfoBar's container
   InfoBarContainer* container_;
 
   // The InfoBar's delegate.
   InfoBarDelegate* delegate_;
 
   // The Close Button at the right edge of the InfoBar.
   views::ImageButton* close_button_;
 
   // The animation that runs when the InfoBar is opened or closed.
-  scoped_ptr<SlideAnimation> animation_;
+  scoped_ptr<ui::SlideAnimation> animation_;
 
   // Tracks and stores the last focused view which is not the InfoBar or any of
   // its children. Used to restore focus once the InfoBar is closed.
   scoped_ptr<views::ExternalFocusTracker> focus_tracker_;
 
   // Used to delete this object after a return to the message loop.
   ScopedRunnableMethodFactory<InfoBar> delete_factory_;
 
   // The target height for the InfoBar.
   double target_height_;
@@ skipping 78 matching lines @@
   views::NativeButton* cancel_button_;
   views::Link* link_;
 
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBar);
 };
 
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBARS_H_