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

Unified Diff: chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.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/bookmarks/bookmark_pasteboard_helper_mac.mm
diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
index 69c9dc8670e7a7a1ef4151574f664bf951e61717..c14c82b7c75a1637f7d79b4ae46fd6721aa41dc1 100644
--- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
+++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
@@ -13,7 +13,9 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/profiles/profile.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
+#include "grit/ui_resources_standard.h"
#include "skia/ext/skia_utils_mac.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/mac/nsimage_cache.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ -348,8 +350,10 @@ bool PasteboardContainsBookmarks(PasteboardType type) {
NSImage* DragImageForBookmark(NSImage* favicon, const string16& title) {
// If no favicon, use a default.
- if (!favicon)
- favicon = gfx::GetCachedImageWithName(@"nav.pdf");
Avi (use Gerrit) 2012/06/26 14:28:27 How soon will it be before we can get rid of GetCa
Nico 2012/06/26 21:45:44 Two more pages of callers left according to cs
+ if (!favicon) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
+ }
// If no title, just use icon.
if (title.empty())
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/ui/cocoa/tab_contents/favicon_util.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698