chrome/browser/prerender/prerender_manager.h - Issue 138583003: Add back the code to PrerenderManager::PendingSwap to handle RenderViewCreated being called for a...

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.h

Issue 138583003: Add back the code to PrerenderManager::PendingSwap to handle RenderViewCreated being called for a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 6 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | chrome/browser/prerender/prerender_tracker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prerender/prerender_manager.h

===================================================================

--- chrome/browser/prerender/prerender_manager.h (revision 244941)

+++ chrome/browser/prerender/prerender_manager.h (working copy)

@@ -454,6 +454,8 @@

const GURL& validated_url,

content::PageTransition transition_type,

content::RenderViewHost* render_view_host) OVERRIDE;

+ virtual void RenderViewCreated(

+ content::RenderViewHost* render_view_host) OVERRIDE;

virtual void DidFailProvisionalLoad(

int64 frame_id,

const base::string16& frame_unique_name,

@@ -479,7 +481,7 @@

bool should_replace_current_entry_;

base::TimeTicks start_time_;

- PrerenderTracker::ChildRouteIdPair render_frame_route_id_pair_;

+ std::vector<PrerenderTracker::ChildRouteIdPair> main_rfh_ids_;

base::OneShotTimer<PendingSwap> merge_timeout_;

bool swap_successful_;