Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/ui/toolbar/back_forward_menu_model.cc

 // Copyright (c) 2011 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 113 matching lines @@
 }
 
 bool BackForwardMenuModel::IsItemCheckedAt(int index) const {
   return false;
 }
 
 int BackForwardMenuModel::GetGroupIdAt(int index) const {
   return false;
 }
 
-bool BackForwardMenuModel::GetIconAt(int index, SkBitmap* icon) {
+bool BackForwardMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
   if (!ItemHasIcon(index))
     return false;
 
   if (index == GetItemCount() - 1) {
-    *icon = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
+    *icon = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_HISTORY_FAVICON);
   } else {
     NavigationEntry* entry = GetNavigationEntry(index);
     *icon = entry->GetFavicon().bitmap;
     if (!entry->GetFavicon().valid && menu_model_delegate()) {
       FetchFavicon(entry);
     }
   }
 
   return true;
@@ skipping 313 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;
 }