Remove dependency on ui::ScaleFactor from ui/gfx

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"
@@ skipping 21 matching lines @@
 #include "url/gurl.h"
 
 namespace {
 
 class GetAttentionImageSource : public gfx::ImageSkiaSource {
  public:
   explicit GetAttentionImageSource(const gfx::ImageSkia& icon)
       : icon_(icon) {}
 
   // gfx::ImageSkiaSource overrides:
-  virtual gfx::ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor)
-      OVERRIDE {
-    gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale_factor);
+  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+    gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale);
     color_utils::HSL shift = {-1, 0, 0.5};
     return gfx::ImageSkiaRep(
         SkBitmapOperations::CreateHSLShiftedBitmap(icon_rep.sk_bitmap(), shift),
-        icon_rep.scale_factor());
+        icon_rep.scale());
   }
 
  private:
   const gfx::ImageSkia icon_;
 };
 
 }  // namespace
 
 // TODO(tbarzic): Merge AnimationIconImageSource and IconAnimation together.
 // Source for painting animated skia image.
 class AnimatedIconImageSource : public gfx::ImageSkiaSource {
  public:
   AnimatedIconImageSource(
       const gfx::ImageSkia& image,
       base::WeakPtr<ExtensionAction::IconAnimation> animation)
       : image_(image),
         animation_(animation) {
   }
 
  private:
   virtual ~AnimatedIconImageSource() {}
 
-  virtual gfx::ImageSkiaRep GetImageForScale(ui::ScaleFactor scale) OVERRIDE {
+  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
     gfx::ImageSkiaRep original_rep = image_.GetRepresentation(scale);
     if (!animation_.get())
       return original_rep;
 
     // Original representation's scale factor may be different from scale
     // factor passed to this method. We want to use the former (since we are
     // using bitmap for that scale).
     return gfx::ImageSkiaRep(
-        animation_->Apply(original_rep.sk_bitmap()),
-        original_rep.scale_factor());
+        animation_->Apply(original_rep.sk_bitmap()), original_rep.scale());
   }
 
   gfx::ImageSkia image_;
   base::WeakPtr<ExtensionAction::IconAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimatedIconImageSource);
 };
 
 const int ExtensionAction::kDefaultTabId = -1;
 // 100ms animation at 50fps (so 5 animation frames in total).
@@ skipping 300 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));
 }