Refactor the code for loading icons into the PageInfoModel.

chrome/browser/cocoa/page_info_bubble_controller.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.
 
 #import "chrome/browser/cocoa/page_info_bubble_controller.h"
 
 #include "app/l10n_util_mac.h"
-#include "app/resource_bundle.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/certificate_viewer.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/cocoa/info_bubble_view.h"
 #import "chrome/browser/cocoa/info_bubble_window.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/x509_certificate.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 @interface PageInfoBubbleController (Private)
 - (PageInfoModel*)model;
 - (NSButton*)certificateButtonWithFrame:(NSRect)frame;
-- (NSImage*)statusIconForState:(PageInfoModel::SectionInfoState)state;
 - (void)configureTextFieldAsLabel:(NSTextField*)textField;
 - (CGFloat)addTitleViewForInfo:(const PageInfoModel::SectionInfo&)info
                     toSubviews:(NSMutableArray*)subviews
                        atPoint:(NSPoint)point;
 - (CGFloat)addDescriptionViewForInfo:(const PageInfoModel::SectionInfo&)info
                           toSubviews:(NSMutableArray*)subviews
                              atPoint:(NSPoint)point;
 - (CGFloat)addCertificateButtonToSubviews:(NSMutableArray*)subviews
                                  atOffset:(CGFloat)offset;
 - (void)addImageViewForInfo:(const PageInfoModel::SectionInfo&)info
@@ skipping 105 matching lines @@
                                           styleMask:NSBorderlessWindowMask
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
 
   NSPoint anchorPoint = AnchorPointFromParentWindow(parentWindow, 0);
   if ((self = [super initWithWindow:window.get()
                        parentWindow:parentWindow
                          anchoredAt:anchorPoint])) {
     model_.reset(model);
     bridge_.reset(bridge);
-
-    // Load the image refs.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    okImage_.reset([rb.GetNSImageNamed(IDR_PAGEINFO_GOOD) retain]);
-    DCHECK_GE(kImageSize, [okImage_ size].width);
-    DCHECK_GE(kImageSize, [okImage_ size].height);
-    warningMinorImage_.reset(
-        [rb.GetNSImageNamed(IDR_PAGEINFO_WARNING_MINOR) retain]);
-    DCHECK_GE(kImageSize, [warningMinorImage_ size].width);
-    DCHECK_GE(kImageSize, [warningMinorImage_ size].height);
-    warningMajorImage_.reset(
-        [rb.GetNSImageNamed(IDR_PAGEINFO_WARNING_MAJOR) retain]);
-    DCHECK_GE(kImageSize, [warningMajorImage_ size].width);
-    DCHECK_GE(kImageSize, [warningMajorImage_ size].height);
-    errorImage_.reset([rb.GetNSImageNamed(IDR_PAGEINFO_BAD) retain]);
-    DCHECK_GE(kImageSize, [errorImage_ size].width);
-    DCHECK_GE(kImageSize, [errorImage_ size].height);
-
     [[self bubble] setArrowLocation:info_bubble::kTopLeft];
-
     [self performLayout];
   }
   return self;
 }
 
 - (PageInfoModel*)model {
   return model_.get();
 }
 
 - (IBAction)showCertWindow:(id)sender {
@@ skipping 13 matching lines @@
 
   // Keep the new subviews in an array that gets replaced at the end.
   NSMutableArray* subviews = [NSMutableArray array];
 
   // Build the window from bottom-up because Cocoa's coordinate origin is the
   // lower left.
   for (int i = model_->GetSectionCount() - 1; i >= 0; --i) {
     PageInfoModel::SectionInfo info = model_->GetSectionInfo(i);
 
     // Only certain sections have images. This affects the X position.
-    BOOL hasImage = info.type == PageInfoModel::SECTION_INFO_IDENTITY ||
-        info.type == PageInfoModel::SECTION_INFO_CONNECTION;
+    BOOL hasImage = model_->GetIconImage(info.icon_id) != nil;
     CGFloat xPosition = (hasImage ? kTextXPosition : kTextXPositionNoImage);
 
     if (info.type == PageInfoModel::SECTION_INFO_IDENTITY) {
       offset += [self addCertificateButtonToSubviews:subviews
           atOffset:offset];
     }
 
     // Create the description of the state.
     offset += [self addDescriptionViewForInfo:info
                                    toSubviews:subviews
@@ skipping 50 matching lines @@
   NSButton* certButton = [[[NSButton alloc] initWithFrame:frame] autorelease];
   [certButton setTitle:
       l10n_util::GetNSStringWithFixup(IDS_PAGEINFO_CERT_INFO_BUTTON)];
   [certButton setButtonType:NSMomentaryPushInButton];
   [certButton setBezelStyle:NSRoundRectBezelStyle];
   [certButton setTarget:self];
   [certButton setAction:@selector(showCertWindow:)];
   return certButton;
 }
 
-// Returns a weak reference to the NSImage instance to used, or nil if none, for
-// the specified info |state|.
-- (NSImage*)statusIconForState:(PageInfoModel::SectionInfoState)state {
-  switch (state) {
-    case PageInfoModel::SECTION_STATE_OK:
-      return okImage_.get();
-    case PageInfoModel::SECTION_STATE_WARNING_MINOR:
-      return warningMinorImage_.get();
-    case PageInfoModel::SECTION_STATE_WARNING_MAJOR:
-      return warningMajorImage_.get();
-    case PageInfoModel::SECTION_STATE_ERROR:
-      return errorImage_.get();
-    default:
-      return nil;
-  }
-}
-
 // Sets proprties on the given |field| to act as the title or description labels
 // in the bubble.
 - (void)configureTextFieldAsLabel:(NSTextField*)textField {
   [textField setEditable:NO];
   [textField setDrawsBackground:NO];
   [textField setBezeled:NO];
 }
 
 // Adds the title text field at the given x,y position, and returns the y
 // position for the next element.
@@ skipping 65 matching lines @@
 // does not affect the next Y position because the image is placed next to
 // a text field that is larger and accounts for the image's size.
 - (void)addImageViewForInfo:(const PageInfoModel::SectionInfo&)info
                  toSubviews:(NSMutableArray*)subviews
                    atOffset:(CGFloat)offset {
   NSRect frame = NSMakeRect(kFramePadding, offset - kImageSize, kImageSize,
       kImageSize);
   scoped_nsobject<NSImageView> imageView(
       [[NSImageView alloc] initWithFrame:frame]);
   [imageView setImageFrameStyle:NSImageFrameNone];
-  [imageView setImage:[self statusIconForState:info.state]];
+  [imageView setImage:model_->GetIconImage(info.icon_id)];
   [subviews addObject:imageView.get()];
 }
 
 @end