chrome/browser/task_manager/task_manager_resource_providers.cc - Issue 11011002: Switch FaviconTabHelper to use WebContentsUserData.

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/task_manager/task_manager_resource_providers.cc

Issue 11011002: Switch FaviconTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 8 years, 3 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/task_manager/task_manager_resource_providers.cc

diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc

index f1ab904a0a539c66b74ba14009e0326f417533e7..0639ff413213e501af2485b7ec8ba4ecfdcfc604 100644

--- a/chrome/browser/task_manager/task_manager_resource_providers.cc

+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc

@@ -340,7 +340,8 @@ string16 TaskManagerTabContentsResource::GetProfileName() const {

gfx::ImageSkia TaskManagerTabContentsResource::GetIcon() const {

if (IsPrerendering())

return *prerender_icon_;

- return tab_contents_->favicon_tab_helper()->GetFavicon().AsImageSkia();

+ return FaviconTabHelper::FromWebContents(tab_contents_->web_contents())->

+ GetFavicon().AsImageSkia();

}

WebContents* TaskManagerTabContentsResource::GetWebContents() const {