Refactor the code for loading icons into the PageInfoModel.

chrome/browser/gtk/page_info_window_gtk.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 <gtk/gtk.h>
 
 #include "build/build_config.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
 
 namespace {
 
 enum {
   RESPONSE_SHOW_CERT_INFO = 0,
 };
 
 class PageInfoWindowGtk : public PageInfoModel::PageInfoModelObserver {
  public:
   PageInfoWindowGtk(gfx::NativeWindow parent,
@@ skipping 111 matching lines @@
 
   PangoAttrList* attributes = pango_attr_list_new();
   pango_attr_list_insert(attributes,
                          pango_attr_weight_new(PANGO_WEIGHT_BOLD));
   gtk_label_set_attributes(GTK_LABEL(label), attributes);
   pango_attr_list_unref(attributes);
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
   gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
   GtkWidget* section_box = gtk_hbox_new(FALSE, 0);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   GtkWidget* image = gtk_image_new_from_pixbuf(
-      section.state == PageInfoModel::SECTION_STATE_OK ?
-      rb.GetPixbufNamed(IDR_PAGEINFO_GOOD) :
-      rb.GetPixbufNamed(IDR_PAGEINFO_WARNING_MAJOR));
+      model_.GetIconImage(section.icon_id));
   gtk_box_pack_start(GTK_BOX(section_box), image, FALSE, FALSE,
                      gtk_util::kControlSpacing);
   gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
 
   GtkWidget* text_box = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   if (!section.headline.empty()) {
     label = gtk_label_new(UTF16ToUTF8(section.headline).c_str());
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
     gtk_box_pack_start(GTK_BOX(text_box), label, FALSE, FALSE, 0);
   }
@@ skipping 48 matching lines @@
     gtk_window_present(GTK_WINDOW(iter->second->widget()));
     return;
   }
 
   PageInfoWindowGtk* page_info_window =
       new PageInfoWindowGtk(parent, profile, url, ssl, show_history);
   page_info_window->Show();
 }
 
 }  // namespace browser