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

ui/views/controls/scrollbar/overlay_scroll_bar.cc

 // Copyright 2013 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.
 
 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h"
 
 namespace views {
 namespace {
 
 const int kScrollbarWidth = 10;
 const int kThumbInsetInside = 3;
 const int kThumbInsetFromEdge = 1;
 const int kThumbCornerRadius = 2;
 const int kThumbMinimumSize = kScrollbarWidth;
 const int kThumbHoverAlpha = 128;
 const int kThumbDefaultAlpha = 64;
 
 class OverlayScrollBarThumb : public BaseScrollBarThumb,
-                              public ui::AnimationDelegate {
+                              public gfx::AnimationDelegate {
  public:
   explicit OverlayScrollBarThumb(BaseScrollBar* scroll_bar);
   virtual ~OverlayScrollBarThumb();
 
  protected:
   // View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
-  // ui::AnimationDelegate overrides:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate overrides:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
  private:
   double animation_opacity_;
   DISALLOW_COPY_AND_ASSIGN(OverlayScrollBarThumb);
 };
 
 OverlayScrollBarThumb::OverlayScrollBarThumb(BaseScrollBar* scroll_bar)
     : BaseScrollBarThumb(scroll_bar),
       animation_opacity_(0.0) {
   if (get_use_acceleration_when_possible()) {
@@ skipping 22 matching lines @@
     // just display the deeper color.
     alpha = kThumbHoverAlpha;
   }
 
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(SkColorSetARGB(alpha, 0, 0, 0));
   canvas->DrawRoundRect(local_bounds, kThumbCornerRadius, paint);
 }
 
 void OverlayScrollBarThumb::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   animation_opacity_ = animation->GetCurrentValue();
   SchedulePaint();
 }
 
 }  // namespace
 
 OverlayScrollBar::OverlayScrollBar(bool horizontal)
     : BaseScrollBar(horizontal, new OverlayScrollBarThumb(this)),
       animation_(static_cast<OverlayScrollBarThumb*>(GetThumb())) {
   set_notify_enter_exit_on_child(true);
@@ skipping 63 matching lines @@
     thumb_bounds.set_y(thumb->y());
     thumb_bounds.set_height(thumb->height());
   }
   thumb->SetBoundsRect(thumb_bounds);
 }
 
 void OverlayScrollBar::OnPaint(gfx::Canvas* canvas) {
 }
 
 }  // namespace views