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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/download/download_item_controller.mm » ('j') | chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index c046f0a7c0573b1260da2365cda49a42f471377f..92ace5cb557411559c4adbe5d059801bb896e9a6 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -183,8 +183,7 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
- (void)awakeFromNib {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- NSImage* infoIcon = rb.GetNativeImageNamed(IDR_INFO);
- DCHECK(infoIcon);
rohitrao (ping after 24h) 2012/09/14 00:11:21 Why no DCHECK anymore?
Robert Sesek 2012/09/14 14:37:15 ToNSImage() CHECKs.
+ NSImage* infoIcon = rb.GetNativeImageNamed(IDR_INFO).ToNSImage();
[infoBarIcon_ setImage:infoIcon];
// Initialize the banner gradient and stroke color.
@@ -404,7 +403,8 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
// Default icon will be the last item in the array.
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
// TODO(rsesek): Rename this resource now that it's in multiple places.
- [icons_ addObject:rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER)];
+ [icons_ addObject:
+ rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).ToNSImage()];
// Create the Cocoa model.
CookieTreeNode* root =
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/download/download_item_controller.mm » ('j') | chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698