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

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

Issue 9815006: ui/gfx: Remove the deprecated "operator const GdkPixbuf*" from Image API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/gtk/infobars/infobar_gtk.cc ('k') | chrome/browser/ui/gtk/nine_box.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 135153ce1650c6f59e417e03cb6d70ad9ef82ef4..3746026a6545c8938790bb5a63cf72315ec74fb7 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -241,7 +241,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
GtkWidget* tab_to_search_hbox = gtk_hbox_new(FALSE, 0);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
tab_to_search_magnifier_ = gtk_image_new_from_pixbuf(
- rb.GetNativeImageNamed(IDR_KEYWORD_SEARCH_MAGNIFIER));
+ rb.GetNativeImageNamed(IDR_KEYWORD_SEARCH_MAGNIFIER).ToGdkPixbuf());
gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_magnifier_,
FALSE, FALSE, 0);
gtk_util::CenterWidgetInHBox(tab_to_search_hbox, tab_to_search_label_hbox,
@@ -281,7 +281,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
theme_service_->BuildLabel("", kHintTextColor);
gtk_widget_set_sensitive(tab_to_search_hint_leading_label_, FALSE);
tab_to_search_hint_icon_ = gtk_image_new_from_pixbuf(
- rb.GetNativeImageNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB));
+ rb.GetNativeImageNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB).ToGdkPixbuf());
tab_to_search_hint_trailing_label_ =
theme_service_->BuildLabel("", kHintTextColor);
gtk_widget_set_sensitive(tab_to_search_hint_trailing_label_, FALSE);
@@ -979,7 +979,7 @@ void LocationBarViewGtk::SetKeywordLabel(const string16& keyword) {
} else {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_),
- rb.GetNativeImageNamed(IDR_OMNIBOX_SEARCH));
+ rb.GetNativeImageNamed(IDR_OMNIBOX_SEARCH).ToGdkPixbuf());
}
}
}
« no previous file with comments | « chrome/browser/ui/gtk/infobars/infobar_gtk.cc ('k') | chrome/browser/ui/gtk/nine_box.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698