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

Unified Diff: chrome/browser/ui/gtk/gtk_util.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
Index: chrome/browser/ui/gtk/gtk_util.cc
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 0126251712f8349bbf8d82767a1576b6160af5a5..aeef9ac7cfc47921ee976ea6178dae8825d2406a 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -133,9 +133,9 @@ GList* GetIconList() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
GList* icon_list = NULL;
icon_list = g_list_append(icon_list,
- rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32));
+ rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_32).ToGdkPixbuf());
icon_list = g_list_append(icon_list,
- rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16));
+ rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
return icon_list;
}
@@ -149,7 +149,7 @@ GList* GetIconList() {
GdkPixbuf* GetAvatarIcon(Profile* profile) {
if (profile->IsOffTheRecord()) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- return rb.GetNativeImageNamed(IDR_OTR_ICON);
+ return rb.GetNativeImageNamed(IDR_OTR_ICON).ToGdkPixbuf();
}
const ProfileInfoCache& cache =
@@ -162,7 +162,7 @@ GdkPixbuf* GetAvatarIcon(Profile* profile) {
const size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
return (index != std::string::npos ?
- cache.GetAvatarIconOfProfileAtIndex(index) :
+ cache.GetAvatarIconOfProfileAtIndex(index).ToGdkPixbuf() :
static_cast<GdkPixbuf*>(NULL));
}
@@ -202,7 +202,7 @@ GdkPixbuf* GetChromeIcon(GtkIconTheme* theme, const int size) {
default: CHECK(false); break;
}
- return gdk_pixbuf_copy(rb.GetNativeImageNamed(id));
+ return gdk_pixbuf_copy(rb.GetNativeImageNamed(id).ToGdkPixbuf());
}
// Adds |emblem| to the bottom-right corner of |icon|.
« no previous file with comments | « chrome/browser/ui/gtk/edit_search_engine_dialog.cc ('k') | chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698