Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/views/tabs/tab_strip.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/views/tabs/tab_strip.h"
 
 #include <algorithm>
 #include <iterator>
 #include <vector>
 
@@ skipping 1221 matching lines @@
                                 newtab_button_asset_width(),
                                 newtab_button_asset_height());
   newtab_button_ = new NewTabButton(this, this);
   newtab_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_TOOLTIP_NEW_TAB));
   newtab_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
   AddChildView(newtab_button_);
   if (drop_indicator_width == 0) {
     // Direction doesn't matter, both images are the same size.
-    SkBitmap* drop_image = GetDropArrowImage(true);
+    gfx::ImageSkia* drop_image = GetDropArrowImage(true);
     drop_indicator_width = drop_image->width();
     drop_indicator_height = drop_image->height();
   }
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableStackedTabStrip)) {
     touch_layout_.reset(new TouchTabStripLayout(
                             Tab::GetStandardSize(),
                             tab_h_offset(),
                             kStackedPadding,
@@ skipping 557 matching lines @@
 int TabStrip::GetDropEffect(const views::DropTargetEvent& event) {
   const int source_ops = event.source_operations();
   if (source_ops & ui::DragDropTypes::DRAG_COPY)
     return ui::DragDropTypes::DRAG_COPY;
   if (source_ops & ui::DragDropTypes::DRAG_LINK)
     return ui::DragDropTypes::DRAG_LINK;
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
 // static
-SkBitmap* TabStrip::GetDropArrowImage(bool is_down) {
-  return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
+gfx::ImageSkia* TabStrip::GetDropArrowImage(bool is_down) {
+  return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
 // TabStrip::DropInfo ----------------------------------------------------------
 
 TabStrip::DropInfo::DropInfo(int drop_index, bool drop_before, bool point_down)
     : drop_index(drop_index),
       drop_before(drop_before),
       point_down(point_down) {
   arrow_view = new views::ImageView;
@@ skipping 184 matching lines @@
   }
   return NULL;
 }
 
 std::vector<int> TabStrip::GetTabXCoordinates() {
   std::vector<int> results;
   for (int i = 0; i < tab_count(); ++i)
     results.push_back(ideal_bounds(i).x());
   return results;
 }