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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 6fb1a6e1aa65e3ba6398548fdbf2d106f49229fe..67e37f85188b5a532ea1b05dfb3a943bae92a829 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -15,6 +15,7 @@
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources_standard.h"
+#include "grit/ui_resources_standard.h"
#include "skia/ext/skia_utils_mac.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -311,8 +312,10 @@ void BookmarkMenuBridge::ConfigureMenuItem(const BookmarkNode* node,
}
// Either we do not have a loaded favicon or the conversion from SkBitmap
// failed. Use the default site image instead.
- if (!favicon)
- favicon = gfx::GetCachedImageWithName(@"nav.pdf");
+ if (!favicon) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
+ }
[item setImage:favicon];
}

Powered by Google App Engine
This is Rietveld 408576698