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

chrome/browser/extensions/extension_action.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 "chrome/browser/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/common/badge_util.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/icon_with_badge_image_source.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
-#include "ui/base/animation/animation_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "url/gurl.h"
 
@@ skipping 52 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AnimatedIconImageSource);
 };
 
 const int ExtensionAction::kDefaultTabId = -1;
 // 100ms animation at 50fps (so 5 animation frames in total).
 const int kIconFadeInDurationMs = 100;
 const int kIconFadeInFramesPerSecond = 50;
 
 ExtensionAction::IconAnimation::IconAnimation()
-    : ui::LinearAnimation(kIconFadeInDurationMs, kIconFadeInFramesPerSecond,
+    : gfx::LinearAnimation(kIconFadeInDurationMs, kIconFadeInFramesPerSecond,
                           NULL),
       weak_ptr_factory_(this) {}
 
 ExtensionAction::IconAnimation::~IconAnimation() {
   // Make sure observers don't access *this after its destructor has started.
   weak_ptr_factory_.InvalidateWeakPtrs();
   // In case the animation was destroyed before it finished (likely due to
   // delays in timer scheduling), make sure it's fully visible.
   FOR_EACH_OBSERVER(Observer, observers_, OnIconChanged());
 }
@@ skipping 285 matching lines @@
   icon_animation->Start();
   // After the icon is finished fading in (plus some padding to handle random
   // timer delays), destroy it. We use a delayed task so that the Animation is
   // deleted even if it hasn't finished by the time the MessageLoop is
   // destroyed.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DestroyIconAnimation, base::Passed(&icon_animation)),
       base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2));
 }