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

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.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_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_result_view_model.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/view.h"
 
 struct AutocompleteMatch;
 class LocationBarView;
 class OmniboxEditModel;
 class OmniboxResultView;
 class OmniboxView;
 class Profile;
 
 // A view representing the contents of the autocomplete popup.
 class OmniboxPopupContentsView : public views::View,
                                  public OmniboxResultViewModel,
                                  public OmniboxPopupView,
-                                 public ui::AnimationDelegate {
+                                 public gfx::AnimationDelegate {
  public:
   // Factory method for creating the AutocompletePopupView.
   static OmniboxPopupView* Create(const gfx::FontList& font_list,
                                   OmniboxView* omnibox_view,
                                   OmniboxEditModel* edit_model,
                                   LocationBarView* location_bar_view);
 
   // 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;
 
   virtual void LayoutChildren();
 
   // Overridden from OmniboxPopupView:
   virtual bool IsOpen() const OVERRIDE;
   virtual void InvalidateLine(size_t line) OVERRIDE;
   virtual void UpdatePopupAppearance() OVERRIDE;
   virtual gfx::Rect GetTargetBounds() OVERRIDE;
   virtual void PaintUpdatesNow() OVERRIDE;
   virtual void OnDragCanceled() OVERRIDE;
 
   // Overridden from OmniboxResultViewModel:
   virtual bool IsSelectedIndex(size_t index) const OVERRIDE;
   virtual bool IsHoveredIndex(size_t index) const OVERRIDE;
   virtual gfx::Image GetIconIfExtensionMatch(size_t index) const OVERRIDE;
 
-  // Overridden from ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // Overridden from gfx::AnimationDelegate:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
   virtual views::View* GetEventHandlerForPoint(
       const gfx::Point& point) OVERRIDE;
   virtual views::View* GetTooltipHandlerForPoint(
       const gfx::Point& point) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
@@ skipping 82 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").
-  ui::SlideAnimation size_animation_;
+  gfx::SlideAnimation size_animation_;
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
   int left_margin_;
   int right_margin_;
 
   const gfx::ImageSkia* bottom_shadow_;  // Ptr owned by resource bundle.
 
   // Amount of extra padding to add to the popup on the top and bottom.
   int outside_vertical_padding_;
 
   // TODO(sky): nuke. Used for debugging 275794.
   bool in_popup_init_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_