Get rid of implicit conversion to and from ImageSkiaRep

ui/views/controls/menu/native_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/native_menu_win.h"
 
 #include <Windowsx.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 238 matching lines @@
 
       ui::MenuModel::ItemType type =
           data->native_menu_win->model_->GetTypeAt(data->model_index);
 
       // Draw the icon after the label, otherwise it would be covered
       // by the label.
       gfx::ImageSkia icon;
       if (data->native_menu_win->model_->GetIconAt(data->model_index, &icon)) {
         // We currently don't support items with both icons and checkboxes.
         DCHECK(type != ui::MenuModel::TYPE_CHECK);
-        gfx::Canvas canvas(icon, false);
+        gfx::Canvas canvas(icon.GetRepresentation(ui::SCALE_FACTOR_100P),
+                           false);
         skia::DrawToNativeContext(
             canvas.sk_canvas(), dc,
             draw_item_struct->rcItem.left + kItemLeftMargin,
             draw_item_struct->rcItem.top + (draw_item_struct->rcItem.bottom -
                 draw_item_struct->rcItem.top - icon.height()) / 2, NULL);
       } else if (type == ui::MenuModel::TYPE_CHECK &&
                  data->native_menu_win->model_->IsItemCheckedAt(
                      data->model_index)) {
         // Manually render a checkbox.
         const MenuConfig& config = MenuConfig::instance();
@@ skipping 478 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(ui::MenuModel* model) {
   return new NativeMenuWin(model, NULL);
 }
 
 }  // namespace views