chrome/browser/ui/cocoa/tab_contents/favicon_util.mm - Issue 10542010: TabContentsWrapper -> TabContents, part 2.

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/tab_contents/favicon_util.mm

Issue 10542010: TabContentsWrapper -> TabContents, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, rename 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/tab_contents/favicon_util.mm

diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm

index 1c503613c03fb797429a085821cae97a3b33f1a1..02915f1f1d17b91baeb327b03ffa71fa232ff175 100644

--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util.mm

@@ -8,14 +8,14 @@

#include "base/mac/mac_util.h"

#include "chrome/browser/favicon/favicon_tab_helper.h"

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "skia/ext/skia_utils_mac.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/gfx/mac/nsimage_cache.h"

namespace mac {

-NSImage* FaviconForTabContents(TabContentsWrapper* contents) {

+NSImage* FaviconForTabContents(TabContents* contents) {

// FaviconTabHelper returns IDR_DEFAULT_FAVICON, which is a rasterized version

// of the Mac PDF. Use the PDF so the icon in the Omnibox matches the default

// favicon.