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

chrome/browser/chromeos/login/take_photo_view.cc

Index: chrome/browser/chromeos/login/take_photo_view.cc
diff --git a/chrome/browser/chromeos/login/take_photo_view.cc b/chrome/browser/chromeos/login/take_photo_view.cc
index 8c16bcb56dd24cbbc859cb3006c4c0d8a76392e1..a9cb1c4c6fd49600e9c0cf0af318b3643c31ba7a 100644
--- a/chrome/browser/chromeos/login/take_photo_view.cc
+++ b/chrome/browser/chromeos/login/take_photo_view.cc
@@ -72,7 +72,7 @@ class CameraImageView : public views::ImageView {
     ShowThrobber();
     SetMessage(string16());
     SetImage(
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_USER_IMAGE_INITIALIZING));
   }
 
@@ -85,7 +85,7 @@ class CameraImageView : public views::ImageView {
     HideThrobber();
     SetMessage(l10n_util::GetStringUTF16(IDS_USER_IMAGE_NO_VIDEO));
     SetImage(
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_USER_IMAGE_NO_VIDEO));
   }
 
@@ -175,11 +175,11 @@ void TakePhotoView::Init() {
   snapshot_button_ = new views::ImageButton(this);
   snapshot_button_->set_focusable(true);
   snapshot_button_->SetImage(views::CustomButton::BS_NORMAL,
-                             ResourceBundle::GetSharedInstance().GetBitmapNamed(
-                                 IDR_USER_IMAGE_CAPTURE));
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_USER_IMAGE_CAPTURE));
   snapshot_button_->SetImage(views::CustomButton::BS_DISABLED,
-                             ResourceBundle::GetSharedInstance().GetBitmapNamed(
-                                 IDR_USER_IMAGE_CAPTURE_DISABLED));
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_USER_IMAGE_CAPTURE_DISABLED));
   snapshot_button_->SetAccessibleName(l10n_util::GetStringUTF16(
       IDS_CHROMEOS_ACC_ACCOUNT_PICTURE));
 
@@ -229,7 +229,7 @@ void TakePhotoView::UpdateVideoFrame(const SkBitmap& frame) {
     snapshot_button_->SetEnabled(true);
     snapshot_button_->RequestFocus();
   }
-  SkBitmap user_image =
+  gfx::ImageSkia user_image =
       skia::ImageOperations::Resize(
           frame,
           skia::ImageOperations::RESIZE_BOX,
@@ -242,8 +242,8 @@ void TakePhotoView::UpdateVideoFrame(const SkBitmap& frame) {
 void TakePhotoView::ShowCameraInitializing() {
   is_capturing_ = true;
   snapshot_button_->SetImage(views::CustomButton::BS_NORMAL,
-                             ResourceBundle::GetSharedInstance().GetBitmapNamed(
-                                 IDR_USER_IMAGE_CAPTURE));
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_USER_IMAGE_CAPTURE));
   snapshot_button_->SetVisible(true);
   snapshot_button_->SetEnabled(false);
   user_image_->SetInitializingState();
@@ -260,7 +260,7 @@ const SkBitmap& TakePhotoView::GetImage() const {
   return user_image_->GetImage();
 }
 
-void TakePhotoView::SetImage(SkBitmap* image) {
+void TakePhotoView::SetImage(gfx::ImageSkia* image) {
   is_capturing_ = false;
   snapshot_button_->SetVisible(false);
   snapshot_button_->SetEnabled(false);
@@ -275,7 +275,7 @@ void TakePhotoView::CaptureImage() {
     is_capturing_ = false;
     snapshot_button_->SetImage(
         views::CustomButton::BS_NORMAL,
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_USER_IMAGE_RECYCLE));
     delegate_->OnCapturingStopped();
     snapshot_button_->SchedulePaint();
@@ -300,7 +300,7 @@ void TakePhotoView::FlipCapturingState() {
     is_capturing_ = true;
     snapshot_button_->SetImage(
         views::CustomButton::BS_NORMAL,
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_USER_IMAGE_CAPTURE));
     delegate_->OnCapturingStarted();
     snapshot_button_->SchedulePaint();