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

chrome/browser/ui/toolbar/back_forward_menu_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "ui/base/models/menu_model.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
 
 namespace content {
 class NavigationEntry;
 class WebContents;
 }
 
 namespace gfx {
-class ImageSkia;
+class Image;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // BackForwardMenuModel
 //
 // Interface for the showing of the dropdown menu for the Back/Forward buttons.
 // Actual implementations are platform-specific.
 ///////////////////////////////////////////////////////////////////////////////
 class BackForwardMenuModel : public ui::MenuModel {
@@ skipping 16 matching lines @@
   // out the total number of items to show.
   virtual int GetItemCount() const OVERRIDE;
   virtual ItemType GetTypeAt(int index) const OVERRIDE;
   virtual int GetCommandIdAt(int index) const OVERRIDE;
   virtual string16 GetLabelAt(int index) const OVERRIDE;
   virtual bool IsItemDynamicAt(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 MenuModel* GetSubmenuModelAt(int index) const OVERRIDE;
   virtual void HighlightChangedTo(int index) OVERRIDE;
   virtual void ActivatedAt(int index) OVERRIDE;
   virtual void ActivatedAt(int index, int event_flags) OVERRIDE;
   virtual void MenuWillShow() OVERRIDE;
 
   // Is the item at |index| a separator?
@@ skipping 124 matching lines @@
   // Used for loading favicons from history.
   CancelableRequestConsumerTSimple<int> load_consumer_;
 
   // Used for receiving notifications when an icon is changed.
   ui::MenuModelDelegate* menu_model_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BackForwardMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_