chrome/browser/ui/cocoa/tabs/tab_strip_controller.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/cocoa/tabs/tab_strip_controller.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/cocoa/tabs/tab_strip_controller.mm

diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

index 2cf2138dbcc7f1589a10dbad9ac4f0c387b19ede..4551d1078c8a4fa1bd7e006d2ed4f777a95bd6f8 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -368,8 +368,9 @@ private:

// (see |-addSubviewToPermanentList:|) will be wiped out.

permanentSubviews_.reset([[NSMutableArray alloc] init]);

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

defaultFavicon_.reset(

- [gfx::GetCachedImageWithName(@"nav.pdf") retain]);

+ [rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);

[self setLeftIndentForControls:[[self class] defaultLeftIndentForControls]];

[self setRightIndentForControls:0];