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

chrome/browser/ui/views/confirm_bubble_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/ui/views/confirm_bubble_view.h"
 
 #include "chrome/browser/ui/confirm_bubble_model.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 62 matching lines @@
   cs->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   gfx::Image* icon_image = model_->GetIcon();
   DCHECK(icon_image);
   views::ImageView* icon_view = new views::ImageView;
-  icon_view->SetImage(icon_image->ToSkBitmap());
+  icon_view->SetImage(icon_image->ToImageSkia());
   layout->AddView(icon_view);
 
   const string16 title_text = model_->GetTitle();
   DCHECK(!title_text.empty());
   views::Label* title_label = new views::Label(title_text);
   title_label->SetFont(bundle.GetFont(ui::ResourceBundle::MediumFont));
   layout->AddView(title_label);
 
   views::ImageButton* close_button = new views::ImageButton(this);
-  const SkBitmap* close_image =
-      bundle.GetImageNamed(IDR_INFO_BUBBLE_CLOSE).ToSkBitmap();
+  const gfx::ImageSkia* close_image =
+      bundle.GetImageNamed(IDR_INFO_BUBBLE_CLOSE).ToImageSkia();
   close_button->SetImage(views::CustomButton::BS_NORMAL, close_image);
   close_button->set_tag(ConfirmBubbleModel::BUTTON_NONE);
   layout->AddView(close_button);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Add the message label to the second row.
   cs = layout->AddColumnSet(1);
   const string16 message_text = model_->GetMessageText();
   DCHECK(!message_text.empty());
   views::Label* message_label = new views::Label(message_text);
@@ skipping 44 matching lines @@
       layout->AddView(ok_button);
     }
     if (has_cancel_button) {
       views::TextButton* cancel_button = new views::NativeTextButton(
           this, model_->GetButtonLabel(ConfirmBubbleModel::BUTTON_CANCEL));
       cancel_button->set_tag(ConfirmBubbleModel::BUTTON_CANCEL);
       layout->AddView(cancel_button);
     }
   }
 }