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

Unified Diff: chrome/browser/ui/panels/panel_window_controller_cocoa.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Comments and merge Created 8 years, 3 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
Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
index e5c8aa10e0bd6f308186d098cec228af8e85d424..95dafd99172444e150c24d0e255ad5d3425fa8c9 100644
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
@@ -573,14 +573,16 @@ NSCursor* LoadWebKitCursor(WebKit::WebCursorInfo::Type type) {
return;
NSImage* iconImage =
- ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_THROBBER);
+ ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_THROBBER).ToNSImage();
icon = [ThrobberView filmstripThrobberViewWithFrame:iconFrame
image:iconImage];
} else {
- gfx::Image page_icon = windowShim_->panel()->GetCurrentPageIcon();
+ const gfx::Image& page_icon = windowShim_->panel()->GetCurrentPageIcon();
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
NSImage* iconImage = page_icon.IsEmpty() ?
- rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) : page_icon.ToNSImage();
+ rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage() :
+ page_icon.ToNSImage();
NSImageView* iconView =
[[[NSImageView alloc] initWithFrame:iconFrame] autorelease];
[iconView setImage:iconImage];
« no previous file with comments | « chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm ('k') | chrome/browser/ui/tests/ui_gfx_image_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698