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

chrome/browser/ui/gtk/menu_gtk.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_GTK_MENU_GTK_H_
 #define CHROME_BROWSER_UI_GTK_MENU_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/gfx/point.h"
 
-class SkBitmap;
+namespace gfx {
+class Image;
+}
 
 namespace ui {
 class ButtonMenuItemModel;
 class MenuModel;
 }
 
 class MenuGtk {
  public:
   // Delegate class that lets another class control the status of the menu.
   class Delegate {
@@ skipping 28 matching lines @@
   MenuGtk(MenuGtk::Delegate* delegate, ui::MenuModel* model);
   virtual ~MenuGtk();
 
   // Initialize GTK signal handlers.
   void ConnectSignalHandlers();
 
   // These methods are used to build the menu dynamically. The return value
   // is the new menu item.
   GtkWidget* AppendMenuItemWithLabel(int command_id, const std::string& label);
   GtkWidget* AppendMenuItemWithIcon(int command_id, const std::string& label,
-                                    const SkBitmap& icon);
+                                    const gfx::Image& icon);
   GtkWidget* AppendCheckMenuItemWithLabel(int command_id,
                                           const std::string& label);
   GtkWidget* AppendSeparator();
   GtkWidget* AppendMenuItem(int command_id, GtkWidget* menu_item);
   GtkWidget* AppendMenuItemToMenu(int index,
                                   ui::MenuModel* model,
                                   GtkWidget* menu_item,
                                   GtkWidget* menu,
                                   bool connect_to_activate);
 
@@ skipping 40 matching lines @@
                                     gpointer userdata);
 
   GtkWidget* widget() const { return menu_; }
 
   // Updates all the enabled/checked states and the dynamic labels.
   void UpdateMenu();
 
  private:
   // Builds a GtkImageMenuItem.
   GtkWidget* BuildMenuItemWithImage(const std::string& label,
-                                    const SkBitmap& icon);
+                                    const gfx::Image& icon);
 
   GtkWidget* BuildMenuItemWithImage(const std::string& label,
                                     GtkWidget* image);
 
   GtkWidget* BuildMenuItemWithLabel(const std::string& label,
                                     int command_id);
 
   // A function that creates a GtkMenu from |model_|.
   void BuildMenuFromModel();
   // Implementation of the above; called recursively.
@@ skipping 60 matching lines @@
   // menu items from getting activated when we are setting up the
   // menu.
   static bool block_activation_;
 
   ui::GtkSignalRegistrar signal_;
 
   base::WeakPtrFactory<MenuGtk> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_MENU_GTK_H_