Index: chrome/browser/ui/cocoa/tab_contents/favicon_util.mm |
diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm |
index 02915f1f1d17b91baeb327b03ffa71fa232ff175..f0b27e0eabbcc3c6944a3b3e1603de3f03eec0bf 100644 |
--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm |
+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm |
@@ -9,16 +9,15 @@ |
#include "base/mac/mac_util.h" |
#include "chrome/browser/favicon/favicon_tab_helper.h" |
#include "chrome/browser/ui/tab_contents/tab_contents.h" |
+#include "grit/ui_resources_standard.h" |
#include "skia/ext/skia_utils_mac.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
+#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/mac/nsimage_cache.h" |
namespace mac { |
NSImage* FaviconForTabContents(TabContents* contents) { |
- // FaviconTabHelper returns IDR_DEFAULT_FAVICON, which is a rasterized version |
- // of the Mac PDF. Use the PDF so the icon in the Omnibox matches the default |
- // favicon. |
if (contents && contents->favicon_tab_helper()->FaviconIsValid()) { |
CGColorSpaceRef color_space = base::mac::GetSystemColorSpace(); |
NSImage* image = gfx::SkBitmapToNSImageWithColorSpace( |
@@ -30,7 +29,8 @@ NSImage* FaviconForTabContents(TabContents* contents) { |
} |
} |
- return gfx::GetCachedImageWithName(@"nav.pdf"); |
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
+ return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON); |
} |
} // namespace mac |