Refactor the code for loading icons into the PageInfoModel.

chrome/browser/cocoa/page_info_window_mac.mm

 // 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 "chrome/browser/cocoa/page_info_window_mac.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/scoped_cftyperef.h"
@@ skipping 49 matching lines @@
 }  // namespace browser
 
 PageInfoWindowMac::PageInfoWindowMac(PageInfoWindowController* controller,
                                      Profile* profile,
                                      const GURL& url,
                                      const NavigationEntry::SSLStatus& ssl,
                                      bool show_history)
     : controller_(controller),
       model_(new PageInfoModel(profile, url, ssl, show_history, this)),
       cert_id_(ssl.cert_id()) {
-  Init();
 }
 
 PageInfoWindowMac::PageInfoWindowMac(PageInfoWindowController* controller,
                                      PageInfoModel* model)
     : controller_(controller),
       model_(model),
       cert_id_(0) {
-  Init();
 }
 
 // static
 void PageInfoWindowMac::ShowPageInfo(gfx::NativeWindow parent,
                                      Profile* profile,
                                      const GURL& url,
                                      const NavigationEntry::SSLStatus& ssl,
                                      bool show_history) {
   // The controller will clean itself up after the NSWindow it manages closes.
   // We do not manage it as it owns us.
   PageInfoWindowController* controller =
       [[PageInfoWindowController alloc] init];
   PageInfoWindowMac* page_info = new PageInfoWindowMac(controller,
                                                        profile,
                                                        url,
                                                        ssl,
                                                        show_history);
   [controller setPageInfo:page_info];
   page_info->LayoutSections();
   page_info->Show();
 }
 
-void PageInfoWindowMac::Init() {
-  // Load the image refs.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  good_image_.reset([rb.GetNSImageNamed(IDR_PAGEINFO_GOOD) retain]);
-  DCHECK_GE(kImageSize, [good_image_ size].width);
-  DCHECK_GE(kImageSize, [good_image_ size].height);
-  bad_image_.reset([rb.GetNSImageNamed(IDR_PAGEINFO_BAD) retain]);
-  DCHECK_GE(kImageSize, [bad_image_ size].width);
-  DCHECK_GE(kImageSize, [bad_image_ size].height);
-}
-
 PageInfoWindowMac::~PageInfoWindowMac() {
 }
 
 void PageInfoWindowMac::ShowCertDialog(int) {
   DCHECK(cert_id_ != 0);
   ShowCertificateViewerByID([controller_ window], cert_id_);
 }
 
 void PageInfoWindowMac::ModelChanged() {
   LayoutSections();
@@ skipping 84 matching lines @@
     [text_field setFrame:text_field_rect];
 
     // Insert the image subview.
     NSRect image_view_rect =
         NSMakeRect(kBoxHorizontalSpacing,
                    box_height - (kImageSize + kBoxTopSpacing),
                    kImageSize, kImageSize);
     scoped_nsobject<NSImageView> image_view(
         [[NSImageView alloc] initWithFrame:image_view_rect]);
     [image_view setImageFrameStyle:NSImageFrameNone];
-    [image_view setImage:(info.state == PageInfoModel::SECTION_STATE_OK) ?
-        good_image_.get() : bad_image_.get()];
+    [image_view setImage:model_->GetIconImage(info.icon_id)];
 
     // Add the box to the list of new subviews.
     [box addSubview:image_view.get()];
     [box addSubview:text_field.get()];
     [subviews addObject:box.get()];
   }
 
   // Replace the window's content.
   [[[controller_ window] contentView] setSubviews:subviews];
 
@@ skipping 15 matching lines @@
       [cert_button setEnabled:YES];
     }
   }
 
   // Resize the window. Only animate if the window is visible, otherwise it
   // could be "growing" while it's opening, looking awkward.
   [[controller_ window] setFrame:window_frame
                          display:YES
                          animate:[[controller_ window] isVisible]];
 }