Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/extensions/extension_action.cc

Index: chrome/browser/extensions/extension_action.cc
diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc
index ccce0ca5256ee1b09595234e2a901170a48dd94c..50ac1856d558a1f04279a5f8c61a4801c59b81ee 100644
--- a/chrome/browser/extensions/extension_action.cc
+++ b/chrome/browser/extensions/extension_action.cc
@@ -39,13 +39,12 @@ class GetAttentionImageSource : public gfx::ImageSkiaSource {
       : 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:
@@ -68,7 +67,7 @@ class AnimatedIconImageSource : public gfx::ImageSkiaSource {
  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;
@@ -77,8 +76,7 @@ class AnimatedIconImageSource : public gfx::ImageSkiaSource {
     // 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_;