chrome/browser/ui/cocoa/tabpose_window.mm - Issue 6735042: Move favicon from TabContents to TabContentsWrapper.

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/tabpose_window.mm

Issue 6735042: Move favicon from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 9 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/tabpose_window.mm

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

index 4349089eecec6eb11248a6502ba44edd52c94983..00cef307e4f84df8614ddc0a4a854656d39d060c 100644

--- a/chrome/browser/ui/cocoa/tabpose_window.mm

+++ b/chrome/browser/ui/cocoa/tabpose_window.mm

@@ -16,6 +16,7 @@

#include "chrome/browser/browser_process.h"

#import "chrome/browser/debugger/devtools_window.h"

#include "chrome/browser/extensions/extension_tab_helper.h"

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

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/renderer_host/render_widget_host_view_mac.h"

@@ -503,7 +504,7 @@ SkBitmap Tile::favicon() const {

if (icon)

return *icon;

}

- return contents_->tab_contents()->GetFavicon();

+ return contents_->favicon_tab_helper()->GetFavicon();

}

NSRect Tile::GetTitleStartRectRelativeTo(const Tile& tile) const {