content/browser/frame_host/interstitial_page_impl.cc - Issue 106963004: Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

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/interstitial_page_impl.cc

Issue 106963004: Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years 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

« content/browser/frame_host/frame_tree_node.cc ('K') | « content/browser/frame_host/frame_tree_unittest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/interstitial_page_impl.cc

diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc

index 7af8d029f7ee0ca82f99283619118ff0e06a9c4c..a2eba69ab05aa08c49b559cb2547660fce5f0bea 100644

--- a/content/browser/frame_host/interstitial_page_impl.cc

+++ b/content/browser/frame_host/interstitial_page_impl.cc

@@ -292,7 +292,7 @@ void InterstitialPageImpl::Hide() {

weak_ptr_factory_.GetWeakPtr(),

render_view_host_));

render_view_host_ = NULL;

- frame_tree_.SwapMainFrame(NULL);

+ frame_tree_.ResetForMainFrameSwap();

controller_->delegate()->DetachInterstitialPage();

// Let's revert to the original title if necessary.

NavigationEntry* entry = controller_->GetVisibleEntry();

@@ -527,7 +527,6 @@ RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() {

return RenderViewHostFactory::Create(site_instance.get(),

this,

- this,

MSG_ROUTING_NONE,

false,