chrome/browser/prerender/prerender_manager.cc - Issue 10905301: Switch CoreTabHelper 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 10905301: Switch CoreTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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 82cf8b1fc03b1c7e892c9c4f4f70820cb2a1c6b7..e3fe79637d9454cfef485eb994a16c96a3f97bbd 100644

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

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

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

// Merge the browsing history.

new_tab_contents->web_contents()->GetController().CopyStateFromAndPrune(

&old_tab_contents->web_contents()->GetController());

- old_tab_contents->core_tab_helper()->delegate()->

- SwapTabContents(old_tab_contents, new_tab_contents);

+ CoreTabHelper::FromWebContents(old_tab_contents->web_contents())->delegate()->

+ SwapTabContents(old_tab_contents->web_contents(),

+ new_tab_contents->web_contents());

prerender_contents->CommitHistory(new_tab_contents);

GURL icon_url = prerender_contents->icon_url();