Refactor the code for loading icons into the PageInfoModel.

This code is basically duplicated twice on each platform. This consolidates all
that into PageInfoModel::GetIconImage() and renames the SectionInfo.state to icon_id.

BUG=none
TEST=Page info windows and bubbles work as they did before across all platforms.

Review URL: http://codereview.chromium.org/3560004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61308 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 38 deletions

diff --git a/chrome/browser/gtk/page_info_bubble_gtk.cc b/chrome/browser/gtk/page_info_bubble_gtk.cc
index 0417d79..031afb6 100644
--- a/chrome/browser/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/gtk/page_info_bubble_gtk.cc
@@ -7,7 +7,6 @@
 #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"
@@ -28,7 +27,6 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
 
 class Profile;
 
@@ -215,36 +213,8 @@ 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();
-    }
-    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);
+  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);
diff --git a/chrome/browser/gtk/page_info_window_gtk.cc b/chrome/browser/gtk/page_info_window_gtk.cc
index 9eaa63e..2b87483 100644
--- a/chrome/browser/gtk/page_info_window_gtk.cc
+++ b/chrome/browser/gtk/page_info_window_gtk.cc
@@ -7,7 +7,6 @@
 #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"
@@ -16,7 +15,6 @@
 #include "chrome/browser/page_info_window.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
 
 namespace {
 
@@ -148,11 +146,8 @@ GtkWidget* PageInfoWindowGtk::CreateSection(
   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);