Remove dependency on ui::ScaleFactor from ui/gfx

ui/views/controls/menu/menu_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_win.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "ui/base/accelerators/accelerator.h"
 #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"
 #include "ui/gfx/win/window_impl.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 const int kIconWidth = 23;
@@ skipping 150 matching lines @@
       DrawTextEx(hDC, const_cast<wchar_t*>(label.data()),
                  static_cast<int>(label.size()), &rect, format | DT_LEFT, NULL);
       if (!accel.empty())
         DrawTextEx(hDC, const_cast<wchar_t*>(accel.data()),
                    static_cast<int>(accel.size()), &rect,
                    format | DT_RIGHT, NULL);
       SelectObject(hDC, old_font);
 
       // 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(
             canvas.sk_canvas(), hDC, lpdis->rcItem.left + kItemLeftMargin,
             lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top -
                 data->icon.height()) / 2, NULL);
       }
 
     } else {
       // Draw the separator
@@ skipping 367 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views