Refactor the code for loading icons into the PageInfoModel.

chrome/browser/gtk/page_info_bubble_gtk.cc

 // Copyright (c) 2010 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/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/info_bubble_gtk.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
 
 class Profile;
 
 namespace {
 
 class PageInfoBubbleGtk : public PageInfoModel::PageInfoModelObserver,
                           public InfoBubbleGtkDelegate,
                           public NotificationObserver {
  public:
   PageInfoBubbleGtk(gfx::NativeWindow parent,
@@ skipping 166 matching lines @@
                    G_CALLBACK(OnHelpLinkClickedThunk), this);
 
   theme_provider_->InitThemesFor(this);
   gtk_widget_show_all(contents_);
 }
 
 GtkWidget* PageInfoBubbleGtk::CreateSection(
     const PageInfoModel::SectionInfo& section) {
   GtkWidget* section_box = gtk_hbox_new(FALSE, 0);
 
-  if (section.type == PageInfoModel::SECTION_INFO_IDENTITY ||
-      section.type == PageInfoModel::SECTION_INFO_CONNECTION) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    GdkPixbuf* pixbuf = NULL;
-    switch (section.state) {
-      case PageInfoModel::SECTION_STATE_OK:
-        pixbuf = rb.GetPixbufNamed(IDR_PAGEINFO_GOOD);
-        break;
-      case PageInfoModel::SECTION_STATE_WARNING_MINOR:
-        DCHECK(section.type == PageInfoModel::SECTION_INFO_CONNECTION);
-        pixbuf = rb.GetPixbufNamed(IDR_PAGEINFO_WARNING_MINOR);
-        break;
-      case PageInfoModel::SECTION_STATE_WARNING_MAJOR:
-        pixbuf = rb.GetPixbufNamed(IDR_PAGEINFO_WARNING_MAJOR);
-        break;
-      case PageInfoModel::SECTION_STATE_ERROR:
-        pixbuf = rb.GetPixbufNamed(IDR_PAGEINFO_BAD);
-        break;
-      default:
-        NOTREACHED();
-    }
+  GdkPixbuf* pixbuf = model_.GetIconImage(section.icon_id);
+  if (pixbuf) {
     GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
     gtk_box_pack_start(GTK_BOX(section_box), image, FALSE, FALSE,
                        gtk_util::kControlSpacing);
-    gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
-  } else if (section.type == PageInfoModel::SECTION_INFO_FIRST_VISIT) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    GdkPixbuf* pixbuf = section.state == PageInfoModel::SECTION_STATE_OK ?
-        rb.GetPixbufNamed(IDR_PAGEINFO_INFO) :
-        rb.GetPixbufNamed(IDR_PAGEINFO_WARNING_MAJOR);
-    GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
-    gtk_box_pack_start(GTK_BOX(section_box), image, FALSE, FALSE,
-                       gtk_util::kControlSpacing);
     gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
   }
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(section_box), vbox, TRUE, TRUE, 0);
 
   if (!section.headline.empty()) {
     GtkWidget* label = gtk_label_new(UTF16ToUTF8(section.headline).c_str());
     labels_.push_back(label);
     PangoAttrList* attributes = pango_attr_list_new();
@@ skipping 53 matching lines @@
 
 void ShowPageInfoBubble(gfx::NativeWindow parent,
                         Profile* profile,
                         const GURL& url,
                         const NavigationEntry::SSLStatus& ssl,
                         bool show_history) {
   new PageInfoBubbleGtk(parent, profile, url, ssl, show_history);
 }
 
 }  // namespace browser