chrome/browser/prerender/prerender_manager.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/prerender/prerender_manager.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/prerender/prerender_manager.cc

diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc

index ec9e8e03b0d4307ba280a433c1ac970d4e1d249d..3ecac7fb54e974b995e2850114f04169fafb1ba4 100644

--- a/chrome/browser/prerender/prerender_manager.cc

+++ b/chrome/browser/prerender/prerender_manager.cc

@@ -411,9 +411,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,

if (!icon_url.is_empty()) {

std::vector<FaviconURL> urls;

urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));

- new_tab_contents->favicon_tab_helper()->OnUpdateFaviconURL(

- prerender_contents->page_id(),

- urls);

+ FaviconTabHelper::FromWebContents(new_tab_contents->web_contents())->

+ OnUpdateFaviconURL(prerender_contents->page_id(), urls);

}

// Update PPLT metrics: