Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7928)

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/options/preferences_window_controller.mm ('k') | chrome/browser/ui/cocoa/search_engine_dialog_controller.mm » ('j') | chrome/default_plugin/plugin_impl_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()];
}
« no previous file with comments | « chrome/browser/ui/cocoa/options/preferences_window_controller.mm ('k') | chrome/browser/ui/cocoa/search_engine_dialog_controller.mm » ('j') | chrome/default_plugin/plugin_impl_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698