Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/extensions/extension_action.cc

Index: trunk/src/chrome/browser/extensions/extension_action.cc
===================================================================
--- trunk/src/chrome/browser/extensions/extension_action.cc	(revision 224497)
+++ trunk/src/chrome/browser/extensions/extension_action.cc	(working copy)
@@ -39,12 +39,13 @@
       : icon_(icon) {}
 
   // gfx::ImageSkiaSource overrides:
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
-    gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale);
+  virtual gfx::ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor)
+      OVERRIDE {
+    gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale_factor);
     color_utils::HSL shift = {-1, 0, 0.5};
     return gfx::ImageSkiaRep(
         SkBitmapOperations::CreateHSLShiftedBitmap(icon_rep.sk_bitmap(), shift),
-        icon_rep.scale());
+        icon_rep.scale_factor());
   }
 
  private:
@@ -67,7 +68,7 @@
  private:
   virtual ~AnimatedIconImageSource() {}
 
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+  virtual gfx::ImageSkiaRep GetImageForScale(ui::ScaleFactor scale) OVERRIDE {
     gfx::ImageSkiaRep original_rep = image_.GetRepresentation(scale);
     if (!animation_.get())
       return original_rep;
@@ -76,7 +77,8 @@
     // 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());
+        animation_->Apply(original_rep.sk_bitmap()),
+        original_rep.scale_factor());
   }
 
   gfx::ImageSkia image_;