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

ash/display/shared_display_edge_indicator.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 "ash/display/shared_display_edge_indicator.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/animation/throb_animation.h"
+#include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
@@ skipping 57 matching lines @@
 }
 
 void SharedDisplayEdgeIndicator::Show(const gfx::Rect& src_bounds,
                                       const gfx::Rect& dst_bounds) {
   DCHECK(!src_indicator_);
   DCHECK(!dst_indicator_);
   src_indicator_ = new IndicatorView;
   dst_indicator_ = new IndicatorView;
   CreateWidget(src_bounds, src_indicator_);
   CreateWidget(dst_bounds, dst_indicator_);
-  animation_.reset(new ui::ThrobAnimation(this));
+  animation_.reset(new gfx::ThrobAnimation(this));
   animation_->SetThrobDuration(kIndicatorAnimationDurationMs);
   animation_->StartThrobbing(-1 /* infinite */);
 }
 
 void SharedDisplayEdgeIndicator::Hide() {
   if (src_indicator_)
     src_indicator_->GetWidget()->Close();
   src_indicator_ = NULL;
   if (dst_indicator_)
     dst_indicator_->GetWidget()->Close();
   dst_indicator_ = NULL;
 }
 
 void SharedDisplayEdgeIndicator::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   int value = animation->CurrentValueBetween(0, 255);
   SkColor color = SkColorSetARGB(0xFF, value, value, value);
   if (src_indicator_)
     static_cast<IndicatorView*>(src_indicator_)->SetColor(color);
   if (dst_indicator_)
     static_cast<IndicatorView*>(dst_indicator_)->SetColor(color);
 
 }
 
 }  // namespace internal
 }  // namespace ash