Remove dependency on ui::ScaleFactor from ui/gfx

ui/views/controls/menu/native_menu_win.cc

Index: ui/views/controls/menu/native_menu_win.cc
diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc
index 10ff3a3d4b6425302ba9185b4ace662f345c27cc..15efaa26524dbc72cbd052360424b141dd997fcb 100644
--- a/ui/views/controls/menu/native_menu_win.cc
+++ b/ui/views/controls/menu/native_menu_win.cc
@@ -16,6 +16,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/base/models/menu_model.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
@@ -261,7 +262,7 @@ class NativeMenuWin::MenuHostWindow {
         const gfx::ImageSkia* skia_icon = icon.ToImageSkia();
         DCHECK(type != ui::MenuModel::TYPE_CHECK);
         gfx::Canvas canvas(
-            skia_icon->GetRepresentation(ui::SCALE_FACTOR_100P),
+            skia_icon->GetRepresentation(1.0f),
             false);
         skia::DrawToNativeContext(
             canvas.sk_canvas(), dc,
@@ -287,7 +288,7 @@ class NativeMenuWin::MenuHostWindow {
             (height - kItemTopMargin - kItemBottomMargin -
              config.check_height) / 2;
         gfx::Canvas canvas(gfx::Size(config.check_width, config.check_height),
-                           ui::SCALE_FACTOR_100P,
+                           1.0f,
                            false);
         NativeTheme::ExtraParams extra;
         extra.menu_check.is_radio = false;