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

chrome/browser/ui/toolbar/wrench_icon_painter.cc

 // Copyright (c) 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 "chrome/browser/ui/toolbar/wrench_icon_painter.h"
 
 #include "grit/theme_resources.h"
-#include "ui/base/animation/multi_animation.h"
 #include "ui/base/theme_provider.h"
+#include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // The wrench icon is made up of this many bars stacked vertically.
 const int kBarCount = 3;
 
 // |value| is the animation progress from 0 to 1. |index| is the index of the
@@ skipping 61 matching lines @@
 void WrenchIconPainter::SetSeverity(Severity severity, bool animate) {
   if (severity_ == severity)
     return;
 
   severity_ = severity;
   delegate_->ScheduleWrenchIconPaint();
   animation_.reset();
   if (severity_ == SEVERITY_NONE || !animate)
     return;
 
-  ui::MultiAnimation::Parts parts;
+  gfx::MultiAnimation::Parts parts;
   // Animate the bars left to right.
-  parts.push_back(ui::MultiAnimation::Part(1300, ui::Tween::LINEAR));
+  parts.push_back(gfx::MultiAnimation::Part(1300, gfx::Tween::LINEAR));
   // Fade out animation.
-  parts.push_back(ui::MultiAnimation::Part(1000, ui::Tween::EASE_IN));
+  parts.push_back(gfx::MultiAnimation::Part(1000, gfx::Tween::EASE_IN));
   // Again, animate the bars left to right.
-  parts.push_back(ui::MultiAnimation::Part(1300, ui::Tween::LINEAR));
+  parts.push_back(gfx::MultiAnimation::Part(1300, gfx::Tween::LINEAR));
 
   animation_.reset(
-      new ui::MultiAnimation(parts, base::TimeDelta::FromMilliseconds(40)));
+      new gfx::MultiAnimation(parts, base::TimeDelta::FromMilliseconds(40)));
   animation_->set_delegate(this);
   animation_->set_continuous(false);
   animation_->Start();
 }
 
 void WrenchIconPainter::Paint(gfx::Canvas* canvas,
                               ui::ThemeProvider* theme_provider,
                               const gfx::Rect& rect,
                               BezelType bezel_type) {
   gfx::Point center = rect.CenterPoint();
@@ skipping 49 matching lines @@
       canvas->DrawImageInt(*image, 0, 0, width, image->height(),
                             x, y, width, image->height(), false, paint);
       y += image->height();
     }
   }
 
   if (!badge_.isNull())
     canvas->DrawImageInt(badge_, 0, 0);
 }
 
-void WrenchIconPainter::AnimationProgressed(const ui::Animation* animation) {
+void WrenchIconPainter::AnimationProgressed(const gfx::Animation* animation) {
   delegate_->ScheduleWrenchIconPaint();
 }
 
 int WrenchIconPainter::GetCurrentSeverityImageID() const {
   switch (severity_) {
     case SEVERITY_NONE:
       return 0;
     case SEVERITY_LOW:
       return IDR_TOOLS_BAR_LOW;
     case SEVERITY_MEDIUM:
       return IDR_TOOLS_BAR_MEDIUM;
     case SEVERITY_HIGH:
       return IDR_TOOLS_BAR_HIGH;
   }
   NOTREACHED();
   return 0;
 }