Refactor the code for loading icons into the PageInfoModel.

chrome/browser/views/page_info_window_view.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 "build/build_config.h"
 
-#include "app/resource_bundle.h"
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
 #include "chrome/common/pref_names.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
 #include "net/base/x509_certificate.h"
 #include "views/background.h"
 #include "views/grid_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
@@ skipping 72 matching lines @@
   static int opened_window_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PageInfoWindowView);
 };
 
 // A section contains an image that shows a status (good or bad), a title, an
 // optional head-line (in bold) and a description.
 class Section : public views::View {
  public:
   Section(const string16& title,
-          bool state,
           const string16& head_line,
-          const string16& description);
+          const string16& description,
+          const SkBitmap* icon);
   virtual ~Section();
 
   virtual int GetHeightForWidth(int w);
   virtual void Layout();
 
  private:
   // The text placed on top of the section (on the left of the separator bar).
   string16 title_;
 
-  // Whether to show the good/bad icon.
-  bool state_;
-
   // The first line of the description, show in bold.
   string16 head_line_;
 
   // The description, displayed below the head line.
   string16 description_;
 
-  static SkBitmap* good_state_icon_;
-  static SkBitmap* bad_state_icon_;
-
   views::Label* title_label_;
   views::Separator* separator_;
   views::ImageView* status_image_;
   views::Label* head_line_label_;
   views::Label* description_label_;
 
   DISALLOW_COPY_AND_ASSIGN(Section);
 };
 
 // static
-SkBitmap* Section::good_state_icon_ = NULL;
-SkBitmap* Section::bad_state_icon_ = NULL;
 int PageInfoWindowView::opened_window_count_ = 0;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PageInfoWindowViews
 
 PageInfoWindowView::PageInfoWindowView(gfx::NativeWindow parent,
                                        Profile* profile,
                                        const GURL& url,
@@ skipping 53 matching lines @@
                      1,  // Resize weight.
                      views::GridLayout::USE_PREF,  // Size type.
                      0,  // Ignored for USE_PREF.
                      0);  // Minimum size.
   columns->AddPaddingColumn(0, kHorizontalPadding);
 
   layout->AddPaddingRow(0, kVerticalPadding);
   for (int i = 0; i < model_.GetSectionCount(); ++i) {
     PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
     layout->StartRow(0, 0);
-    layout->AddView(new Section(
-        info.title, info.state == PageInfoModel::SECTION_STATE_OK,
-        info.headline, info.description));
+    layout->AddView(new Section(info.title, info.headline, info.description,
+        model_.GetIconImage(info.icon_id)));
     layout->AddPaddingRow(0, kVerticalPadding);
   }
   layout->AddPaddingRow(1, kVerticalPadding);
 
   Layout();
 }
 
 void PageInfoWindowView::Show() {
   window()->Show();
   opened_window_count_++;
@@ skipping 94 matching lines @@
 }
 
 void PageInfoWindowView::ShowCertDialog(int cert_id) {
   ShowCertificateViewerByID(window()->GetNativeWindow(), cert_id);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Section
 
 Section::Section(const string16& title,
-                 bool state,
                  const string16& head_line,
-                 const string16& description)
+                 const string16& description,
+                 const SkBitmap* icon)
     : title_(title),
-      state_(state),
       head_line_(head_line),
       description_(description) {
-  if (!good_state_icon_) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    good_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_GOOD);
-    // The exclamation point has been re-purposed as a warning
-    // signal in the new code.
-    bad_state_icon_ = rb.GetBitmapNamed(IDR_PAGEINFO_WARNING_MAJOR);
-  }
   title_label_ = new views::Label(UTF16ToWideHack(title));
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(title_label_);
 
 #if defined(OS_WIN)
   separator_ = new views::Separator();
   AddChildView(separator_);
 #else
   NOTIMPLEMENTED();
 #endif
 
   status_image_ = new views::ImageView();
-  status_image_->SetImage(state ? good_state_icon_ : bad_state_icon_);
+  status_image_->SetImage(*icon);
   AddChildView(status_image_);
 
   head_line_label_ = new views::Label(UTF16ToWideHack(head_line));
   head_line_label_->SetFont(
       head_line_label_->font().DeriveFont(0, gfx::Font::BOLD));
   head_line_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(head_line_label_);
 
   description_label_ = new views::Label(UTF16ToWideHack(description));
   description_label_->SetMultiLine(true);
@@ skipping 75 matching lines @@
                   Profile* profile,
                   const GURL& url,
                   const NavigationEntry::SSLStatus& ssl,
                   bool show_history) {
   PageInfoWindowView* page_info_window =
       new PageInfoWindowView(parent, profile, url, ssl, show_history);
   page_info_window->Show();
 }
 
 }