mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON.

chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <cmath>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #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"
 
 NSString* const kBookmarkDictionaryListPboardType =
     @"BookmarkDictionaryListPboardType";
 
 namespace {
 
 // An unofficial standard pasteboard title type to be provided alongside the
 // |NSURLPboardType|.
@@ skipping 314 matching lines @@
   NSArray* availableTypes =
       [NSArray arrayWithObjects:kBookmarkDictionaryListPboardType,
                                 kCrWebURLsWithTitlesPboardType,
                                 NSURLPboardType,
                                 nil];
   return [pb availableTypeFromArray:availableTypes] != nil;
 }
 
 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 GetCachedImageWithName?

[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())
     return favicon;
   NSString* ns_title = base::SysUTF16ToNSString(title);
 
   // Set the look of the title.
   NSDictionary* attrs =
       [NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:
                                            [NSFont smallSystemFontSize]]
@@ skipping 62 matching lines @@
   [window dragImage:drag_image
                  at:position
              offset:NSZeroSize
               event:drag_event
          pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]
              source:nil
           slideBack:YES];
 }
 
 }  // namespace bookmark_pasteboard_helper_mac