Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/gtk/speech_recognition_bubble_gtk.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_bubble.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 234 matching lines @@
 
       // The text label and cancel button are hidden in this mode, but we want
       // the popup to appear the same size as it would once recording starts,
       // so as to reduce UI jank when recording starts. So we calculate the
       // difference in size between the two sets of controls and add that as
       // padding around the icon here.
       GtkRequisition cancel_size;
       gtk_widget_get_child_requisition(cancel_button_, &cancel_size);
       GtkRequisition label_size;
       gtk_widget_get_child_requisition(label_, &label_size);
-      SkBitmap* volume = ResourceBundle::GetSharedInstance().GetBitmapNamed(
-          IDR_SPEECH_INPUT_MIC_EMPTY);
+      gfx::ImageSkia* volume = ResourceBundle::GetSharedInstance().
+          GetImageSkiaNamed(IDR_SPEECH_INPUT_MIC_EMPTY);
       int desired_width = std::max(volume->width(), cancel_size.width) +
                           kIconHorizontalPadding * 2;
       int desired_height = volume->height() + label_size.height +
                            cancel_size.height +
                            kBubbleControlVerticalSpacing * 2;
       int diff_width = desired_width - icon_image().width();
       int diff_height = desired_height - icon_image().height();
       gtk_alignment_set_padding(GTK_ALIGNMENT(icon_container_),
                                 diff_height / 2, diff_height - diff_height / 2,
                                 diff_width / 2, diff_width - diff_width / 2);
     } else {
       // Reset the padding done above.
       gtk_alignment_set_padding(GTK_ALIGNMENT(icon_container_), 0, 0,
                                 kIconHorizontalPadding, kIconHorizontalPadding);
       gtk_widget_show(cancel_button_);
     }
   }
 }
 
 void SpeechRecognitionBubbleGtk::UpdateImage() {
-  SkBitmap image = icon_image();
+  gfx::ImageSkia image = icon_image();
   if (image.isNull() || !bubble_)
     return;
 
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(image);
   gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), pixbuf);
   g_object_unref(pixbuf);
 }
 
 void SpeechRecognitionBubbleGtk::BubbleClosing(BubbleGtk* bubble,
                                                bool closed_by_escape) {
   bubble_ = NULL;
   if (!did_invoke_close_)
     delegate_->InfoBubbleFocusChanged();
 }
 
 }  // namespace
 
 SpeechRecognitionBubble* SpeechRecognitionBubble::CreateNativeBubble(
     WebContents* web_contents,
     Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechRecognitionBubbleGtk(web_contents, delegate, element_rect);
 }