Index: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm |
diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm |
index 9cc016e4d7e6c39d1e678ed6b239a441664a0754..bf29af034c34290dcdc962f33d1a6c30419ec8db 100644 |
--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm |
+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm |
@@ -13,14 +13,12 @@ namespace mac { |
NSImage* FaviconForTabContents(TabContents* contents) { |
if (contents && contents->favicon_tab_helper()->FaviconIsValid()) { |
- NSImage* image = contents->favicon_tab_helper()->GetFavicon().AsNSImage(); |
- // The |image| could be nil if the bitmap is null. In that case, fallback |
- // to the default image. |
- if (image) { |
- return image; |
- } |
+ const gfx::Image& icon = contents->favicon_tab_helper()->GetFavicon(); |
+ if (!icon.IsEmpty()) |
+ return icon.ToNSImage();; |
} |
+ // Fall back to the default image. |
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON); |
} |