Integrate gfx::Image into the ResourceBundle.

chrome/browser/ui/cocoa/page_info_bubble_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/page_info_bubble_controller.h"
 
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/x509_certificate.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/image.h"
 
 @interface PageInfoBubbleController (Private)
 - (PageInfoModel*)model;
 - (NSButton*)certificateButtonWithFrame:(NSRect)frame;
 - (void)configureTextFieldAsLabel:(NSTextField*)textField;
 - (CGFloat)addHeadlineViewForInfo:(const PageInfoModel::SectionInfo&)info
                        toSubviews:(NSMutableArray*)subviews
                           atPoint:(NSPoint)point;
 - (CGFloat)addDescriptionViewForInfo:(const PageInfoModel::SectionInfo&)info
                           toSubviews:(NSMutableArray*)subviews
@@ skipping 357 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);
   scoped_nsobject<NSImageView> imageView(
       [[NSImageView alloc] initWithFrame:frame]);
   [imageView setImageFrameStyle:NSImageFrameNone];
-  [imageView setImage:model_->GetIconImage(info.icon_id)];
+  [imageView setImage:*model_->GetIconImage(info.icon_id)];
   [subviews addObject:imageView.get()];
 }
 
 // Adds the help center button that explains the icons. Returns the y position
 // delta for the next offset.
 - (CGFloat)addHelpButtonToSubviews:(NSMutableArray*)subviews
                           atOffset:(CGFloat)offset {
   NSRect frame = NSMakeRect(kFramePadding, offset, 100, 10);
   scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:frame]);
   NSString* string =
@@ skipping 39 matching lines @@
     LocationBarViewMac* locationBar = [controller locationBarBridge];
     if (locationBar) {
       NSPoint bubblePoint = locationBar->GetPageInfoBubblePoint();
       origin = [parent convertBaseToScreen:bubblePoint];
     }
   }
   return origin;
 }
 
 @end