Have ResourceBundle own GdkPixbufs.

chrome/browser/gtk/custom_button.cc

 // Copyright (c) 2009 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/gtk/custom_button.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/browser/gtk/nine_box.h"
 
 #include "grit/theme_resources.h"
 
 CustomDrawButtonBase::CustomDrawButtonBase(
     int normal_id,
     int active_id,
     int highlight_id,
     int depressed_id) {
   // Load the button images from the resource bundle.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  pixbufs_[GTK_STATE_NORMAL] = normal_id ? rb.LoadPixbuf(normal_id) : NULL;
-  pixbufs_[GTK_STATE_ACTIVE] = active_id ? rb.LoadPixbuf(active_id) : NULL;
+  pixbufs_[GTK_STATE_NORMAL] = normal_id ? rb.GetPixbufNamed(normal_id) : NULL;
+  pixbufs_[GTK_STATE_ACTIVE] = active_id ? rb.GetPixbufNamed(active_id) : NULL;
   pixbufs_[GTK_STATE_PRELIGHT] =
-      highlight_id ? rb.LoadPixbuf(highlight_id) : NULL;
+      highlight_id ? rb.GetPixbufNamed(highlight_id) : NULL;
   pixbufs_[GTK_STATE_SELECTED] = NULL;
   pixbufs_[GTK_STATE_INSENSITIVE] =
-      depressed_id ? rb.LoadPixbuf(depressed_id) : NULL;
+      depressed_id ? rb.GetPixbufNamed(depressed_id) : NULL;
 }
 
 CustomDrawButtonBase::~CustomDrawButtonBase() {
-  for (size_t i = 0; i < arraysize(pixbufs_); ++i) {
-    if (pixbufs_[i])
-      g_object_unref(pixbufs_[i]);
-  }
 }
 
 gboolean CustomDrawButtonBase::OnExpose(GtkWidget* widget, GdkEventExpose* e) {
   GdkPixbuf* pixbuf = pixbufs(GTK_WIDGET_STATE(widget));
 
   // Fall back to the default image if we don't have one for this state.
   if (!pixbuf)
     pixbuf = pixbufs(GTK_STATE_NORMAL);
 
   if (!pixbuf)
@@ skipping 42 matching lines @@
 // static
 CustomDrawButton* CustomDrawButton::AddBarCloseButton(GtkWidget* hbox) {
   CustomDrawButton* rv = new CustomDrawButton(IDR_CLOSE_BAR, IDR_CLOSE_BAR_P,
                                               IDR_CLOSE_BAR_H, 0);
   GTK_WIDGET_UNSET_FLAGS(rv->widget(), GTK_CAN_FOCUS);
   GtkWidget* centering_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(centering_vbox), rv->widget(), TRUE, FALSE, 0);
   gtk_box_pack_end(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, 0);
   return rv;
 }