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

chrome/browser/chromeos/status/network_menu.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/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 135 matching lines @@
   virtual bool HasIcons() const OVERRIDE;
   virtual int GetItemCount() const OVERRIDE;
   virtual ui::MenuModel::ItemType GetTypeAt(int index) const OVERRIDE;
   virtual string16 GetLabelAt(int index) const OVERRIDE;
   virtual bool IsItemDynamicAt(int index) const OVERRIDE;
   virtual const gfx::Font* GetLabelFontAt(int index) const OVERRIDE;
   virtual bool GetAcceleratorAt(int index,
                                 ui::Accelerator* accelerator) const OVERRIDE;
   virtual bool IsItemCheckedAt(int index) const OVERRIDE;
   virtual int GetGroupIdAt(int index) const OVERRIDE;
-  virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE;
+  virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE;
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
       int index) const OVERRIDE;
   virtual bool IsEnabledAt(int index) const OVERRIDE;
   virtual bool IsVisibleAt(int index) const OVERRIDE;
   virtual ui::MenuModel* GetSubmenuModelAt(int index) const OVERRIDE;
   virtual void HighlightChangedTo(int index) OVERRIDE;
   virtual void ActivatedAt(int index) OVERRIDE;
   virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) OVERRIDE;
 
  protected:
@@ skipping 202 matching lines @@
 
 bool NetworkMenuModel::IsItemCheckedAt(int index) const {
   // All ui::MenuModel::TYPE_CHECK menu items are checked.
   return true;
 }
 
 int NetworkMenuModel::GetGroupIdAt(int index) const {
   return 0;
 }
 
-bool NetworkMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
+bool NetworkMenuModel::GetIconAt(int index, gfx::Image* icon) {
   if (!menu_items_[index].icon.isNull()) {
-    *icon = menu_items_[index].icon;
+    *icon = gfx::Image(menu_items_[index].icon);
     return true;
   }
   return false;
 }
 
 ui::ButtonMenuItemModel* NetworkMenuModel::GetButtonMenuItemAt(
     int index) const {
   return NULL;
 }
 
@@ skipping 710 matching lines @@
 
 void NetworkMenu::ShowOtherWifi() {
   NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow());
 }
 
 void NetworkMenu::ShowOtherCellular() {
   ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
 }
 
 }  // namespace chromeos