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

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.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_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #pragma once
 
-#include "app/animation_delegate.h"
-#include "app/slide_animation.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "gfx/font.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
 #include "views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 #else
 #include "chrome/browser/views/autocomplete/autocomplete_popup_gtk.h"
 #endif
 
 class AutocompleteEditModel;
@@ skipping 14 matching lines @@
 
   // Returns the special-case icon we should use for the given index, or NULL
   // if we should use the default icon.
   virtual const SkBitmap* GetSpecialIcon(size_t index) const = 0;
 };
 
 // A view representing the contents of the autocomplete popup.
 class AutocompletePopupContentsView : public views::View,
                                       public AutocompleteResultViewModel,
                                       public AutocompletePopupView,
-                                      public AnimationDelegate {
+                                      public ui::AnimationDelegate {
  public:
   AutocompletePopupContentsView(const gfx::Font& font,
                                 AutocompleteEditView* edit_view,
                                 AutocompleteEditModel* edit_model,
                                 Profile* profile,
                                 const views::View* location_bar);
   virtual ~AutocompletePopupContentsView();
 
   // Returns the bounds the popup should be shown at. This is the display bounds
   // and includes offsets for the dropshadow which this view's border renders.
   gfx::Rect GetPopupBounds() const;
 
   // Overridden from AutocompletePopupView:
   virtual bool IsOpen() const;
   virtual void InvalidateLine(size_t line);
   virtual void UpdatePopupAppearance();
   virtual gfx::Rect GetTargetBounds();
   virtual void PaintUpdatesNow();
   virtual void OnDragCanceled();
   virtual AutocompletePopupModel* GetModel();
 
   // Overridden from AutocompleteResultViewModel:
   virtual bool IsSelectedIndex(size_t index) const;
   virtual bool IsHoveredIndex(size_t index) const;
   virtual const SkBitmap* GetSpecialIcon(size_t index) const;
 
-  // Overridden from AnimationDelegate:
-  virtual void AnimationProgressed(const Animation* animation);
+  // Overridden from ui::AnimationDelegate:
+  virtual void AnimationProgressed(const ui::Animation* animation);
 
   // Overridden from views::View:
   virtual void Paint(gfx::Canvas* canvas);
   virtual void PaintChildren(gfx::Canvas* canvas) {
     // We paint our children inside Paint().
   }
   virtual void Layout();
   virtual void OnMouseEntered(const views::MouseEvent& event);
   virtual void OnMouseMoved(const views::MouseEvent& event);
   virtual void OnMouseExited(const views::MouseEvent& event);
@@ skipping 70 matching lines @@
   // If the user cancels a dragging action (i.e. by pressing ESC), we don't have
   // a convenient way to release mouse capture. Instead we use this flag to
   // simply ignore all remaining drag events, and the eventual mouse release
   // event. Since OnDragCanceled() can be called when we're not dragging, this
   // flag is reset to false on a mouse pressed event, to make sure we don't
   // erroneously ignore the next drag.
   bool ignore_mouse_drag_;
 
   // The popup sizes vertically using an animation when the popup is getting
   // shorter (not larger, that makes it look "slow").
-  SlideAnimation size_animation_;
+  ui::SlideAnimation size_animation_;
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
   // If non-NULL the instant opt-in-view is visible.
   views::View* opt_in_view_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_