Convert most of the rest of chrome to ImageSkia

chrome/browser/speech/speech_recognition_bubble.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 
 class SkBitmap;
 class SkCanvas;
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
 class Canvas;
+class ImageSkia;
 class Rect;
 }
 
 // SpeechRecognitionBubble displays a popup info bubble during speech
 // recognition, points to the html element which requested speech recognition
 // and shows progress events. The popup is closed by the user clicking anywhere
 // outside the popup window, or by the caller destroying this object.
 class SpeechRecognitionBubble {
  public:
   // The various buttons which may be part of the bubble.
@@ skipping 115 matching lines @@
   // Updates the platform specific UI layout for the current display mode.
   virtual void UpdateLayout() = 0;
 
   // Overridden by subclasses to copy |icon_image()| to the screen.
   virtual void UpdateImage() = 0;
 
   DisplayMode display_mode() const { return display_mode_; }
 
   const string16& message_text() const { return message_text_; }
 
-  SkBitmap icon_image();
+  gfx::ImageSkia icon_image();
 
  private:
   void DoRecognizingAnimationStep();
   void DoWarmingUpAnimationStep();
-  void SetImage(const SkBitmap& image);
+  void SetImage(const gfx::ImageSkia& image);
 
   void DrawVolumeOverlay(SkCanvas* canvas,
-                         const SkBitmap& bitmap,
+                         const gfx::ImageSkia& image_skia,
                          float volume);
 
   // Task factory used for animation timer.
   base::WeakPtrFactory<SpeechRecognitionBubbleBase> weak_factory_;
   int animation_step_;  // Current index/step of the animation.
-  std::vector<SkBitmap> animation_frames_;
-  std::vector<SkBitmap> warming_up_frames_;
+  std::vector<gfx::ImageSkia> animation_frames_;
+  std::vector<gfx::ImageSkia> warming_up_frames_;
 
   DisplayMode display_mode_;
   string16 message_text_;  // Text displayed in DISPLAY_MODE_MESSAGE
   // The current microphone image with volume level indication.
   scoped_ptr<SkBitmap> mic_image_;
   // A temporary buffer image used in creating the above mic image.
   scoped_ptr<SkBitmap> buffer_image_;
   // WebContents in which this this bubble gets displayed.
   content::WebContents* web_contents_;
   // The current image displayed in the bubble's icon widget.
-  scoped_ptr<SkBitmap> icon_image_;
+  scoped_ptr<gfx::ImageSkia> icon_image_;
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechRecognitionBubble::Delegate SpeechRecognitionBubbleDelegate;
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_