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

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

Index: trunk/src/chrome/browser/extensions/extension_icon_image.cc
===================================================================
--- trunk/src/chrome/browser/extensions/extension_icon_image.cc	(revision 224497)
+++ trunk/src/chrome/browser/extensions/extension_icon_image.cc	(working copy)
@@ -86,7 +86,8 @@
 
  private:
   // gfx::ImageSkiaSource overrides:
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE;
+  virtual gfx::ImageSkiaRep GetImageForScale(
+      ui::ScaleFactor scale_factor) OVERRIDE;
 
   // Used to load images, possibly asynchronously. NULLed out when the IconImage
   // is destroyed.
@@ -111,17 +112,16 @@
   host_ = NULL;
 }
 
-gfx::ImageSkiaRep IconImage::Source::GetImageForScale(float scale) {
+gfx::ImageSkiaRep IconImage::Source::GetImageForScale(
+    ui::ScaleFactor scale_factor) {
   gfx::ImageSkiaRep representation;
-  if (host_) {
-    representation =
-        host_->LoadImageForScaleFactor(ui::GetSupportedScaleFactor(scale));
-  }
+  if (host_)
+    representation = host_->LoadImageForScaleFactor(scale_factor);
 
   if (!representation.is_null())
     return representation;
 
-  return blank_image_.GetRepresentation(scale);
+  return blank_image_.GetRepresentation(scale_factor);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -163,7 +163,7 @@
   if (!extension_)
     return gfx::ImageSkiaRep();
 
-  const float scale = ui::GetImageScale(scale_factor);
+  const float scale = ui::GetScaleFactorScale(scale_factor);
   const int resource_size_in_pixel =
       static_cast<int>(resource_size_in_dip_ * scale);
 
@@ -184,7 +184,7 @@
 
   // If there is no resource found, return default icon.
   if (resource.empty())
-    return default_icon_.GetRepresentation(scale);
+    return default_icon_.GetRepresentation(scale_factor);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
   info_list.push_back(ImageLoader::ImageRepresentation(
@@ -198,12 +198,13 @@
   loader->LoadImagesAsync(extension_, info_list,
                           base::Bind(&IconImage::OnImageLoaded,
                                      weak_ptr_factory_.GetWeakPtr(),
-                                     scale));
+                                     scale_factor));
 
   return gfx::ImageSkiaRep();
 }
 
-void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
+void IconImage::OnImageLoaded(ui::ScaleFactor scale_factor,
+                              const gfx::Image& image_in) {
   const gfx::ImageSkia* image =
       image_in.IsEmpty() ? &default_icon_ : image_in.ToImageSkia();
 
@@ -211,12 +212,12 @@
   if (image->isNull())
     return;
 
-  gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
+  gfx::ImageSkiaRep rep = image->GetRepresentation(scale_factor);
   DCHECK(!rep.is_null());
-  DCHECK_EQ(scale, rep.scale());
+  DCHECK_EQ(scale_factor, rep.scale_factor());
 
   // Remove old representation if there is one.
-  image_skia_.RemoveRepresentation(scale);
+  image_skia_.RemoveRepresentation(rep.scale_factor());
   image_skia_.AddRepresentation(rep);
 
   if (observer_)