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

chrome/browser/chromeos/login/take_photo_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/chromeos/login/take_photo_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 54 matching lines @@
     message_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     message_->SetVisible(false);
     CorrectLabelFontSize(message_);
     AddChildView(message_);
   }
 
   void SetInitializingState() {
     ShowThrobber();
     SetMessage(string16());
     SetImage(
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_USER_IMAGE_INITIALIZING));
   }
 
   void SetNormalState() {
     HideThrobber();
     SetMessage(string16());
   }
 
   void SetErrorState() {
     HideThrobber();
     SetMessage(l10n_util::GetStringUTF16(IDS_USER_IMAGE_NO_VIDEO));
     SetImage(
-        ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_USER_IMAGE_NO_VIDEO));
   }
 
   bool HasSnapshot() const {
     return !throbber_->visible() && !message_->visible();
   }
 
  private:
   void ShowThrobber() {
     DCHECK(throbber_);
@@ skipping 69 matching lines @@
   }
 
   user_image_ = new CameraImageView();
   user_image_->SetImageSize(
       gfx::Size(login::kUserImageSize, login::kUserImageSize));
   user_image_->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));
 
   InitLayout();
   // Request focus only after the button is added to views hierarchy.
   snapshot_button_->RequestFocus();
 }
 
 void TakePhotoView::InitLayout() {
   views::GridLayout* layout = new views::GridLayout(this);
@@ skipping 29 matching lines @@
 
 void TakePhotoView::UpdateVideoFrame(const SkBitmap& frame) {
   if (!is_capturing_)
     return;
 
   if (!snapshot_button_->enabled()) {
     user_image_->SetNormalState();
     snapshot_button_->SetEnabled(true);
     snapshot_button_->RequestFocus();
   }
-  SkBitmap user_image =
+  gfx::ImageSkia user_image =
       skia::ImageOperations::Resize(
           frame,
           skia::ImageOperations::RESIZE_BOX,
           login::kUserImageSize,
           login::kUserImageSize);
 
   user_image_->SetImage(&user_image);
 }
 
 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();
 }
 
 void TakePhotoView::ShowCameraError() {
   if (!is_capturing_)
     return;
   snapshot_button_->SetEnabled(false);
   user_image_->SetErrorState();
 }
 
 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);
   user_image_->SetNormalState();
   user_image_->SetImage(image);
 }
 
 void TakePhotoView::CaptureImage() {
   DCHECK(delegate_);
   DCHECK(is_capturing_);
   if (is_capturing_ && user_image_->HasSnapshot()) {
     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();
   }
 }
 
 gfx::Size TakePhotoView::GetPreferredSize() {
   return gfx::Size(width(), height());
 }
 
 void TakePhotoView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   DCHECK(delegate_);
   DCHECK(sender == snapshot_button_);
   FlipCapturingState();
 }
 
 void TakePhotoView::FlipCapturingState() {
   if (is_capturing_) {
     CaptureImage();
   } else {
     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();
   }
 }
 
 }  // namespace chromeos