| 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);
|
| + 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 =
|
|
|