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

chrome/browser/ui/views/omnibox/omnibox_result_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_RESULT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
 
 #include <vector>
 
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
 class LocationBarView;
 class OmniboxResultViewModel;
 
 namespace gfx {
 class Canvas;
 class RenderText;
 }
 
 class OmniboxResultView : public views::View,
-                          private ui::AnimationDelegate {
+                          private gfx::AnimationDelegate {
  public:
   // Keep these ordered from least dominant (normal) to most dominant
   // (selected).
   enum ResultViewState {
     NORMAL = 0,
     HOVERED,
     SELECTED,
     NUM_STATES
   };
 
@@ skipping 86 matching lines @@
   //     LTR_STRING ...RTS_LTR
   // Instead of:
   //     LTR_STRING RTS_LTR...
   void Elide(Runs* runs, int remaining_width) const;
 
   // views::View:
   virtual void Layout() OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
-  // ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   static int default_icon_size_;
 
   // Default values cached here, may be overridden using the setters above.
   int edge_item_padding_;
   int item_padding_;
   int minimum_text_vertical_padding_;
 
   // This row's model and model index.
   OmniboxResultViewModel* model_;
@@ skipping 12 matching lines @@
   scoped_ptr<MirroringContext> mirroring_context_;
 
   AutocompleteMatch match_;
 
   gfx::Rect text_bounds_;
   gfx::Rect icon_bounds_;
 
   gfx::Rect keyword_text_bounds_;
   scoped_ptr<views::ImageView> keyword_icon_;
 
-  scoped_ptr<ui::SlideAnimation> animation_;
+  scoped_ptr<gfx::SlideAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_