chrome/browser/ui/panels/panel_window_controller_cocoa.mm - Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/panels/panel_window_controller_cocoa.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: deps 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:

Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm

diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm

index ac4967846d39336b5903ff2c58a926dd3bcdafa5..6a349fc701009cc8fed70e972c8d59ff86bcb13f 100644

--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm

+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm

@@ -578,8 +578,9 @@ enum {

image:iconImage];

} else {

SkBitmap bitmap = windowShim_->panel()->GetCurrentPageIcon();

+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();

NSImage* iconImage = bitmap.isNull() ?

- gfx::GetCachedImageWithName(@"nav.pdf") :

+ rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) :

gfx::SkBitmapToNSImageWithColorSpace(bitmap,

base::mac::GetSystemColorSpace());

NSImageView* iconView =