Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Unified Diff: chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
index 5161ac7bbdd8b802e6fae6a53a3c76d09dbb6344..4099503bc05bc707059d3d6b3fd83842875e0231 100644
--- a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
@@ -252,8 +252,8 @@ void SpeechRecognitionBubbleGtk::UpdateLayout() {
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 +
@@ -274,7 +274,7 @@ void SpeechRecognitionBubbleGtk::UpdateLayout() {
}
void SpeechRecognitionBubbleGtk::UpdateImage() {
- SkBitmap image = icon_image();
+ gfx::ImageSkia image = icon_image();
if (image.isNull() || !bubble_)
return;

Powered by Google App Engine
This is Rietveld 408576698