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

trunk/src/ui/gfx/image/canvas_image_source.cc

Index: trunk/src/ui/gfx/image/canvas_image_source.cc
===================================================================
--- trunk/src/ui/gfx/image/canvas_image_source.cc	(revision 224498)
+++ trunk/src/ui/gfx/image/canvas_image_source.cc	(working copy)
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "ui/gfx/canvas.h"
+#include "ui/base/layout.h"
 
 namespace gfx {
 
@@ -17,8 +18,9 @@
       is_opaque_(is_opaque) {
 }
 
-gfx::ImageSkiaRep CanvasImageSource::GetImageForScale(float scale) {
-  gfx::Canvas canvas(size_, scale, is_opaque_);
+gfx::ImageSkiaRep CanvasImageSource::GetImageForScale(
+    ui::ScaleFactor scale_factor) {
+  gfx::Canvas canvas(size_, scale_factor, is_opaque_);
   Draw(&canvas);
   return canvas.ExtractImageRep();
 }