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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.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
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index b41d4c6624a51d0a7ac146de307461386c449881..a7e338f1578ba84045b7deb19251f232e410a8f4 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -374,7 +374,7 @@ private:
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
defaultFavicon_.reset(
- [rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
+ rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
[self setLeftIndentForControls:[[self class] defaultLeftIndentForControls]];
[self setRightIndentForControls:0];
@@ -1451,14 +1451,14 @@ private:
return;
static NSImage* throbberWaitingImage =
- [ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_THROBBER_WAITING) retain];
+ ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_THROBBER_WAITING).CopyNSImage();
static NSImage* throbberLoadingImage =
- [ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_THROBBER)
- retain];
+ ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_THROBBER).CopyNSImage();
static NSImage* sadFaviconImage =
- [ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_SAD_FAVICON)
- retain];
+ ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+ IDR_SAD_FAVICON).CopyNSImage();
// Take closing tabs into account.
NSInteger index = [self indexFromModelIndex:modelIndex];
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698