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

chrome/browser/first_run/try_chrome_dialog_view.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/first_run/try_chrome_dialog_view.h"
 
 #include <shellapi.h>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 46 matching lines @@
 }
 
 TryChromeDialogView::~TryChromeDialogView() {
 }
 
 TryChromeDialogView::Result TryChromeDialogView::ShowModal(
     ProcessSingleton* process_singleton) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   views::ImageView* icon = new views::ImageView();
-  icon->SetImage(rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToSkBitmap());
+  icon->SetImage(rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToImageSkia());
   gfx::Size icon_size = icon->GetPreferredSize();
 
   // An approximate window size. After Layout() we'll get better bounds.
   popup_ = new views::Widget;
   if (!popup_) {
     NOTREACHED();
     return DIALOG_ERROR;
   }
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
@@ skipping 74 matching lines @@
   string16 heading = l10n_util::GetStringUTF16(experiment.heading);
   views::Label* label = new views::Label(heading);
   label->SetFont(rb.GetFont(ResourceBundle::MediumBoldFont));
   label->SetMultiLine(true);
   label->SizeToFit(200);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->AddView(label);
   // The close button is custom.
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
-                         rb.GetNativeImageNamed(IDR_CLOSE_BAR).ToSkBitmap());
+                         rb.GetNativeImageNamed(IDR_CLOSE_BAR).ToImageSkia());
   close_button->SetImage(views::CustomButton::BS_HOT,
-                         rb.GetNativeImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap());
+                         rb.GetNativeImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
   close_button->SetImage(views::CustomButton::BS_PUSHED,
-                         rb.GetNativeImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap());
+                         rb.GetNativeImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
   close_button->set_tag(BT_CLOSE_BUTTON);
   layout->AddView(close_button);
 
   // Second row views.
   const string16 try_it(l10n_util::GetStringUTF16(IDS_TRY_TOAST_TRY_OPT));
   layout->StartRowWithPadding(0, 1, 0, 10);
   try_chrome_ = new views::RadioButton(try_it, 1);
   layout->AddView(try_chrome_);
   try_chrome_->SetChecked(true);
 
@@ skipping 109 matching lines @@
     else
       NOTREACHED() << "Unknown radio button selected";
   }
   popup_->Close();
   MessageLoop::current()->Quit();
 }
 
 void TryChromeDialogView::LinkClicked(views::Link* source, int event_flags) {
   ::ShellExecuteW(NULL, L"open", kHelpCenterUrl, NULL, NULL, SW_SHOW);
 }