Convert most of the rest of chrome to ImageSkia

chrome/browser/speech/speech_recognition_tray_icon_controller.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/speech/speech_recognition_tray_icon_controller.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 // Number of volume steps used when rendering the VU meter icon.
 const int kVolumeSteps = 6;
 
 // A lazily initialized singleton to hold all the images used by the
 // notification icon and safely destroy them on exit.
 class NotificationTrayImages {
  public:
-  SkBitmap* mic_full() { return mic_full_; }
-  SkBitmap* mic_empty() { return mic_empty_; }
-  SkBitmap* balloon_icon() { return balloon_icon_; }
+  gfx::ImageSkia* mic_full() { return mic_full_; }
+  gfx::ImageSkia* mic_empty() { return mic_empty_; }
+  gfx::ImageSkia* balloon_icon() { return balloon_icon_; }
 
  private:
   // Private constructor to enforce singleton.
   friend struct base::DefaultLazyInstanceTraits<NotificationTrayImages>;
   NotificationTrayImages();
 
-  // These bitmaps are owned by ResourceBundle and need not be destroyed.
-  SkBitmap* mic_full_; // Tray mic image with full volume.
-  SkBitmap* mic_empty_; // Tray mic image with zero volume.
-  SkBitmap* balloon_icon_; // High resolution mic for the notification balloon.
+  // These images are owned by ResourceBundle and need not be destroyed.
+  gfx::ImageSkia* mic_full_; // Tray mic image with full volume.
+  gfx::ImageSkia* mic_empty_; // Tray mic image with zero volume.
+  // High resolution mic for the notification balloon.
+  gfx::ImageSkia* balloon_icon_;
 };
 
 NotificationTrayImages::NotificationTrayImages() {
-  mic_empty_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  mic_empty_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_SPEECH_INPUT_TRAY_MIC_EMPTY);
-  mic_full_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  mic_full_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_SPEECH_INPUT_TRAY_MIC_FULL);
-  balloon_icon_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+  balloon_icon_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_SPEECH_INPUT_TRAY_BALLOON_ICON);
 }
 
 base::LazyInstance<NotificationTrayImages> g_images = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 SpeechRecognitionTrayIconController::SpeechRecognitionTrayIconController()
     : tray_icon_(NULL) {
   Initialize();
@@ skipping 91 matching lines @@
 
   buffer_image_.reset(new SkBitmap());
   buffer_image_->setConfig(SkBitmap::kARGB_8888_Config,
                            g_images.Get().mic_empty()->width(),
                            g_images.Get().mic_empty()->height());
   buffer_image_->allocPixels();
 }
 
 void SpeechRecognitionTrayIconController::DrawVolume(
     SkCanvas* canvas,
-    const SkBitmap& bitmap,
+    const gfx::ImageSkia& image,
     float volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   buffer_image_->eraseARGB(0, 0, 0, 0);
 
   int width = mic_image_->width();
   int height = mic_image_->height();
   SkCanvas buffer_canvas(*buffer_image_);
 
   SkScalar clip_top =
       (((1.0f - volume) * (height * (kVolumeSteps + 1))) - height) /
       kVolumeSteps;
   buffer_canvas.clipRect(SkRect::MakeLTRB(0, clip_top,
       SkIntToScalar(width), SkIntToScalar(height)));
-  buffer_canvas.drawBitmap(bitmap, 0, 0);
+  buffer_canvas.drawBitmap(image, 0, 0);
 
   canvas->drawBitmap(*buffer_image_.get(), 0, 0);
 }
 
 void SpeechRecognitionTrayIconController::ShowNotificationBalloon(
     const string16& text) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   string16 title = l10n_util::GetStringUTF16(
       IDS_SPEECH_INPUT_TRAY_BALLOON_TITLE);
   string16 message = l10n_util::GetStringFUTF16(
           IDS_SPEECH_INPUT_TRAY_BALLOON_BODY,
           text,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
   tray_icon_->DisplayBalloon(*g_images.Get().balloon_icon(), title, message);
 }