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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.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/cocoa/bookmarks/bookmark_menu_bridge.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 95dd9db9354e99ab3c0f99bc9c15a40b898ca187..61108b2f4b7b04ca1ec3673a1d73485054c21e3d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -67,7 +67,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,
if (!folder_image_) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
folder_image_.reset(
- [rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]);
+ rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage());
}
ClearBookmarkMenu(bookmark_menu);
@@ -313,7 +313,7 @@ void BookmarkMenuBridge::ConfigureMenuItem(const BookmarkNode* node,
// If we do not have a loaded favicon, use the default site image instead.
if (!favicon) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
+ favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
}
[item setImage:favicon];
}

Powered by Google App Engine
This is Rietveld 408576698