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

chrome/browser/ui/toolbar/back_forward_menu_model.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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 115 matching lines @@
 }
 
 bool BackForwardMenuModel::IsItemCheckedAt(int index) const {
   return false;
 }
 
 int BackForwardMenuModel::GetGroupIdAt(int index) const {
   return false;
 }
 
-bool BackForwardMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
+bool BackForwardMenuModel::GetIconAt(int index, gfx::Image* icon) {
   if (!ItemHasIcon(index))
     return false;
 
   if (index == GetItemCount() - 1) {
-    *icon = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+    *icon = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
         IDR_HISTORY_FAVICON);
   } else {
     NavigationEntry* entry = GetNavigationEntry(index);
-    *icon = *entry->GetFavicon().image.ToImageSkia();
+    *icon = entry->GetFavicon().image;
     if (!entry->GetFavicon().valid && menu_model_delegate()) {
       FetchFavicon(entry);
     }
   }
 
   return true;
 }
 
 ui::ButtonMenuItemModel* BackForwardMenuModel::GetButtonMenuItemAt(
     int index) const {
@@ skipping 114 matching lines @@
     }
 
     if (!entry)
       // The NavigationEntry wasn't found, this can happen if the user
       // navigates to another page and a NavigatationEntry falls out of the
       // range of kMaxHistoryItems.
       return;
 
     // Now that we have a valid NavigationEntry, decode the favicon and assign
     // it to the NavigationEntry.
-    SkBitmap fav_icon;
-    if (gfx::PNGCodec::Decode(favicon.image_data->front(),
-                              favicon.image_data->size(),
-                              &fav_icon)) {
+    gfx::Image icon(favicon.image_data->front(), favicon.image_data->size());
+    if (!icon.IsEmpty()) {
       entry->GetFavicon().valid = true;
       entry->GetFavicon().url = favicon.icon_url;
-      if (fav_icon.empty())
-        return;
       // TODO: Once the history service returns more representations,
       // use them all instead of having just the lodpi favicon.
-      entry->GetFavicon().image = gfx::Image(fav_icon);
+      entry->GetFavicon().image = icon;
       if (menu_model_delegate()) {
         menu_model_delegate()->OnIconChanged(model_index);
       }
     }
   }
 }
 
 int BackForwardMenuModel::GetHistoryItemCount() const {
   WebContents* contents = GetWebContents();
   int items = 0;
@@ skipping 169 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }