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

chrome/browser/ui/views/web_intent_picker_views.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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 96 matching lines @@
 StarsView::StarsView(double rating)
     : rating_(rating) {
   const int kSpacing = 1;  // Spacing between stars in pixels.
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, kSpacing));
 
   for (int i = 0; i < 5; ++i) {
     views::ImageView* image = new views::ImageView();
-    image->SetImage(rb.GetBitmapNamed(
+    image->SetImage(rb.GetImageSkiaNamed(
         WebIntentPicker::GetNthStarImageIdFromCWSRating(rating, i)));
     AddChildView(image);
   }
 
   // TODO(binji): Add tooltip with text rating
   // "Average Rating: X.XX stars (YYYYY)"
   // Y = "1: Hated it, 2: Disliked it, 3: It was okay, 4: Liked it,
   //      5: Loved it"
   // Choose Y based on rounded X.
 }
@@ skipping 369 matching lines @@
 };
 
 SuggestedExtensionsRowView::SuggestedExtensionsRowView(
     const WebIntentPickerModel::SuggestedExtension* extension,
     Delegate* delegate)
     : extension_(extension),
       delegate_(delegate) {
   SetLayoutManager(new SuggestedExtensionsLayout);
 
   icon_ = new views::ImageView();
-  icon_->SetImage(extension_->icon.ToSkBitmap());
+  icon_->SetImage(extension_->icon.ToImageSkia());
   AddChildView(icon_);
 
   string16 elided_title = ui::ElideText(
       extension_->title, gfx::Font(), kTitleLinkMaxWidth, ui::ELIDE_AT_END);
   title_link_ = new views::Link(elided_title);
   title_link_->set_listener(this);
   AddChildView(title_link_);
 
   stars_ = new StarsView(extension_->average_rating);
   AddChildView(stars_);
@@ skipping 399 matching lines @@
   views::ColumnSet* full_cs = grid_layout->AddColumnSet(1);
   full_cs->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                      GridLayout::USE_PREF, 0, 0);
 
   const WebIntentPickerModel::InstalledService* service =
       model_->GetInstalledServiceWithURL(model_->inline_disposition_url());
 
   // Header row.
   grid_layout->StartRow(0, 0);
   views::ImageView* icon = new views::ImageView();
-  icon->SetImage(service->favicon.ToSkBitmap());
+  icon->SetImage(service->favicon.ToImageSkia());
   grid_layout->AddView(icon);
 
   string16 elided_title = ui::ElideText(
       service->title, gfx::Font(), kTitleLinkMaxWidth, ui::ELIDE_AT_END);
   views::Label* title = new views::Label(elided_title);
   grid_layout->AddView(title);
 
   choose_another_service_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_INTENT_PICKER_USE_ALTERNATE_SERVICE));
   grid_layout->AddView(choose_another_service_link_);
@@ skipping 212 matching lines @@
       GetWindowBoundsForClientBounds(client_bounds);
   // TODO(binji): figure out how to get the constrained dialog centered...
   window_->SetSize(new_window_bounds.size());
 }
 
 #if defined(USE_CLOSE_BUTTON)
 views::ImageButton* WebIntentPickerViews::CreateCloseButton() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
-                          rb.GetBitmapNamed(IDR_CLOSE_BAR));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
   close_button->SetImage(views::CustomButton::BS_HOT,
-                          rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
-                          rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
+                          rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
   return close_button;
 }
 #endif