Remove dependency on ui::ScaleFactor from ui/gfx

ui/views/controls/menu/menu_win.cc

Index: ui/views/controls/menu/menu_win.cc
diff --git a/ui/views/controls/menu/menu_win.cc b/ui/views/controls/menu/menu_win.cc
index d75402b76ed51c6c0c0b3204a87b4e0c642c1fb9..05c3202179355bf97518ce956121f79c21e742ff 100644
--- a/ui/views/controls/menu/menu_win.cc
+++ b/ui/views/controls/menu/menu_win.cc
@@ -13,6 +13,7 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/layout.h"

[Ben Goodger (Google), 2013/09/16 23:10:31]

etc

 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
@@ -183,8 +184,7 @@ class MenuHostWindow : public gfx::WindowImpl {
 
       // Draw the icon after the label, otherwise it would be covered
       // by the label.
-      gfx::ImageSkiaRep icon_image_rep =
-          data->icon.GetRepresentation(ui::SCALE_FACTOR_100P);
+      gfx::ImageSkiaRep icon_image_rep = data->icon.GetRepresentation(1.0f);
       if (data->icon.width() != 0 && data->icon.height() != 0) {
         gfx::Canvas canvas(icon_image_rep, false);
         skia::DrawToNativeContext(