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

chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.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/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 64 matching lines @@
     } else {
       // Ironically the label will end up getting converted back to UTF8 later.
       // We need to escape any Windows-style "&" characters since they will be
       // converted in MenuGtk outside of our control here.
       const string16 label = UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(
           bookmark_utils::BuildMenuLabelFor(child)));
       // No command id. We override ActivatedAt below to handle activations.
       AddItem(kBookmarkItemCommandId, label);
       const gfx::Image& node_icon = model_->GetFavicon(child);
       if (!node_icon.IsEmpty())
-        SetIcon(GetItemCount() - 1, *node_icon.ToSkBitmap());
+        SetIcon(GetItemCount() - 1, node_icon);
       // TODO(mdm): set up an observer to watch for icon load events and set
       // the icons in response.
     }
   }
 }
 
 void BookmarkNodeMenuModel::AddSubMenuForNode(const BookmarkNode* node) {
   DCHECK(node->is_folder());
   // Ironically the label will end up getting converted back to UTF8 later.
   // We need to escape any Windows-style "&" characters since they will be
@@ skipping 125 matching lines @@
 
 bool BookmarkSubMenuModel::IsVisibleAt(int index) const {
   // We don't want the delegate interfering with bookmark items.
   return index >= fixed_items_ || SimpleMenuModel::IsVisibleAt(index);
 }
 
 // static
 bool BookmarkSubMenuModel::IsBookmarkItemCommandId(int command_id) {
   return command_id == kBookmarkItemCommandId;
 }