Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

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"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/win/wrapped_window_proc.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/models/menu_model.h"
 #include "ui/base/native_theme/native_theme.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/menu/menu_2.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_listener.h"
 
 using ui::NativeTheme;
 
 namespace views {
 
@@ skipping 211 matching lines @@
         DrawTextEx(dc, const_cast<wchar_t*>(accel.data()),
                    static_cast<int>(accel.size()), &rect,
                    format | DT_RIGHT, NULL);
       SelectObject(dc, old_font);
 
       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;
+      gfx::Image icon;
       if (data->native_menu_win->model_->GetIconAt(data->model_index, &icon)) {
         // We currently don't support items with both icons and checkboxes.
+        const gfx::ImageSkia* skia_icon = icon.ToImageSkia();
         DCHECK(type != ui::MenuModel::TYPE_CHECK);
-        gfx::Canvas canvas(icon.GetRepresentation(ui::SCALE_FACTOR_100P),
-                           false);
+        gfx::Canvas canvas(
+            skia_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);
+                draw_item_struct->rcItem.top - skia_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();
         NativeTheme::State state;
         if (draw_item_struct->itemState & ODS_DISABLED) {
           state = NativeTheme::kDisabled;
         } else {
           state = draw_item_struct->itemState & ODS_SELECTED ?
@@ skipping 474 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(ui::MenuModel* model) {
   return new NativeMenuWin(model, NULL);
 }
 
 }  // namespace views