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

Unified Diff: chrome/browser/gtk/browser_toolbar_gtk.cc

Issue 67179: Have ResourceBundle own GdkPixbufs. (Closed)
Patch Set: null Created 11 years, 8 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/gtk/browser_toolbar_gtk.cc
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 2083b58c62e928bf5247b4536a1cfc9a65cd9c00..798c2f7d38a24f4f1dfbfadd1855513b5d40b6b1 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -261,7 +261,7 @@ void BrowserToolbarGtk::BuildToolbarMenuButton(
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
gtk_container_set_border_width(GTK_CONTAINER(button), 2);
gtk_container_add(GTK_CONTAINER(button),
- gtk_image_new_from_pixbuf(rb.LoadPixbuf(icon_id)));
+ gtk_image_new_from_pixbuf(rb.GetPixbufNamed(icon_id)));
gtk_widget_set_tooltip_text(button, localized_tooltip.c_str());
g_signal_connect(G_OBJECT(button), "button-press-event",
@@ -404,15 +404,15 @@ void BrowserToolbarGtk::InitNineBox() {
ResourceBundle &rb = ResourceBundle::GetSharedInstance();
GdkPixbuf* images[9] = {
- rb.LoadPixbuf(IDR_CONTENT_TOP_LEFT_CORNER),
- rb.LoadPixbuf(IDR_CONTENT_TOP_CENTER),
- rb.LoadPixbuf(IDR_CONTENT_TOP_RIGHT_CORNER),
- rb.LoadPixbuf(IDR_CONTENT_LEFT_SIDE),
+ rb.GetPixbufNamed(IDR_CONTENT_TOP_LEFT_CORNER),
+ rb.GetPixbufNamed(IDR_CONTENT_TOP_CENTER),
+ rb.GetPixbufNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
+ rb.GetPixbufNamed(IDR_CONTENT_LEFT_SIDE),
NULL,
- rb.LoadPixbuf(IDR_CONTENT_RIGHT_SIDE),
- rb.LoadPixbuf(IDR_CONTENT_BOTTOM_LEFT_CORNER),
- rb.LoadPixbuf(IDR_CONTENT_BOTTOM_CENTER),
- rb.LoadPixbuf(IDR_CONTENT_BOTTOM_RIGHT_CORNER)
+ rb.GetPixbufNamed(IDR_CONTENT_RIGHT_SIDE),
+ rb.GetPixbufNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER),
+ rb.GetPixbufNamed(IDR_CONTENT_BOTTOM_CENTER),
+ rb.GetPixbufNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER)
};
background_ninebox_.reset(new NineBox(images));
}

Powered by Google App Engine
This is Rietveld 408576698