chrome/browser/ui/cocoa/page_info_bubble_controller.mm - Issue 6541031: Integrate gfx::Image into the ResourceBundle.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/page_info_bubble_controller.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add some comments Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/cocoa/page_info_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm

index d79ef5c31ef558c3857e4459f6309f8f868a2ded..1108a98f2203c096248fd6a4fd87ad514adecfea 100644

--- a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm

@@ -25,6 +25,7 @@

#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;

@@ -402,7 +403,7 @@ void ShowPageInfoBubble(gfx::NativeWindow parent,

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()];

}