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

ui/views/controls/slider.cc

 // 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.
 
 #include "ui/views/controls/slider.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kSlideValueChangeDurationMS = 150;
 
 const int kBarImagesActive[] = {
     IDR_SLIDER_ACTIVE_LEFT,
@@ skipping 59 matching lines @@
     return;
   float old_value = value_;
   value_ = value;
   if (listener_)
     listener_->SliderValueChanged(this, value_, old_value, reason);
 
   if (old_value_valid && base::MessageLoop::current()) {
     // Do not animate when setting the value of the slider for the first time.
     // There is no message-loop when running tests. So we cannot animate then.
     animating_value_ = old_value;
-    move_animation_.reset(new ui::SlideAnimation(this));
+    move_animation_.reset(new gfx::SlideAnimation(this));
     move_animation_->SetSlideDuration(kSlideValueChangeDurationMS);
     move_animation_->Show();
     AnimationProgressed(move_animation_.get());
   } else {
     SchedulePaint();
   }
   if (accessibility_events_enabled_ && GetWidget()) {
     NotifyAccessibilityEvent(
         ui::AccessibilityTypes::EVENT_VALUE_CHANGED, true);
   }
@@ skipping 188 matching lines @@
     PrepareForMove(event->location());
     MoveButtonTo(event->location());
     event->SetHandled();
   } else if (event->type() == ui::ET_GESTURE_SCROLL_UPDATE ||
              event->type() == ui::ET_GESTURE_SCROLL_END) {
     MoveButtonTo(event->location());
     event->SetHandled();
   }
 }
 
-void Slider::AnimationProgressed(const ui::Animation* animation) {
+void Slider::AnimationProgressed(const gfx::Animation* animation) {
   animating_value_ = animation->CurrentValueBetween(animating_value_, value_);
   SchedulePaint();
 }
 
 void Slider::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_SLIDER;
   state->name = accessible_name_;
   state->value = UTF8ToUTF16(
       base::StringPrintf("%d%%", (int)(value_ * 100 + 0.5)));
 }
 
 void Slider::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (!focus_border_color_) {
     View::OnPaintFocusBorder(canvas);
   } else if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     canvas->DrawRect(gfx::Rect(1, 1, width() - 3, height() - 3),
                      focus_border_color_);
   }
 }
 
 }  // namespace views