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

trunk/src/ui/gfx/image/image_skia_source.h

Index: trunk/src/ui/gfx/image/image_skia_source.h
===================================================================
--- trunk/src/ui/gfx/image/image_skia_source.h	(revision 224498)
+++ trunk/src/ui/gfx/image/image_skia_source.h	(working copy)
@@ -5,8 +5,7 @@
 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_SOURCE_H_
 #define UI_GFX_IMAGE_IMAGE_SKIA_SOURCE_H_
 
-#include <vector>
-
+#include "ui/base/layout.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
@@ -17,11 +16,11 @@
  public:
   virtual ~ImageSkiaSource() {}
 
-  // Returns the ImageSkiaRep for the given |scale|. ImageSkia caches the
-  // returned ImageSkiaRep and calls this method only if it doesn't have
-  // ImageSkiaRep for given |scale|. There is no need for the implementation to
-  // cache the image.
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) = 0;
+  // Returns the ImageSkiaRep for the given |scale_factor|. ImageSkia
+  // caches the returned ImageSkiaRep and calls this method only if it
+  // doesn't have ImageSkaiRep for given |scale_factor|. There is
+  // no need for the implementation to cache the image.
+  virtual gfx::ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) = 0;
 };
 
 }  // namespace gfx