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

chrome/browser/ui/webui/chromeos/login/network_dropdown.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 "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 
 #include <string>
 
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Timeout between consecutive requests to network library for network
 // scan.
 const int kNetworkScanIntervalSecs = 60;
 
 }  // namespace
 
@@ skipping 49 matching lines @@
   for (int i = 0; i < model->GetItemCount(); ++i) {
     ui::MenuModel::ItemType type = model->GetTypeAt(i);
     int id;
     if (type == ui::MenuModel::TYPE_SEPARATOR)
       id = -2;
     else
       id = model->GetCommandIdAt(i);
     base::DictionaryValue* item = new base::DictionaryValue();
     item->SetInteger("id", id);
     item->SetString("label", model->GetLabelAt(i));
-    gfx::ImageSkia icon;
+    gfx::Image icon;
     if (model->GetIconAt(i, &icon)) {
-      SkBitmap icon_bitmap = icon.GetRepresentation(
+      SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
           ui::GetScaleFactorFromScale(web_ui_->GetDeviceScale())).sk_bitmap();
       item->SetString("icon", web_ui_util::GetImageDataUrl(icon_bitmap));
     }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
       const gfx::Font* font = model->GetLabelFontAt(i);
       if (font) {
         item->SetBoolean("bold", font->GetStyle() == gfx::Font::BOLD);
       }
     }
@@ skipping 71 matching lines @@
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::ForceNetworkScan() {
   CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
   Refresh();
 }
 
 }  // namespace chromeos