content/browser/frame_host/render_frame_host_manager.h - Issue 257083002: Check BrowsingInstance before swapping prerenders.

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: content/browser/frame_host/render_frame_host_manager.h

Issue 257083002: Check BrowsingInstance before swapping prerenders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 8 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: content/browser/frame_host/render_frame_host_manager.h

diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h

index 8d5b594d780e49a33fb561e49b3a2719514855a1..3313d37abb0a16a9e676f7cb9a4f78bd23ec44cf 100644

--- a/content/browser/frame_host/render_frame_host_manager.h

+++ b/content/browser/frame_host/render_frame_host_manager.h

@@ -395,6 +395,11 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {

// Helper method to terminate the pending RenderViewHost.

void CancelPending();

+ // Helper method to set the active RenderFrameHost. Returns the old

+ // RenderFrameHost and updates counts.

+ scoped_ptr<RenderFrameHostImpl> SetRenderFrameHost(

+ scoped_ptr<RenderFrameHostImpl> render_frame_host);

RenderFrameHostImpl* UpdateStateForNavigate(

const NavigationEntryImpl& entry);