content/browser/frame_host/interstitial_page_impl.h - Issue 117693002: 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.h

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

Patch Set: 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

« no previous file with comments | « content/browser/frame_host/frame_tree_unittest.cc ('k') | content/browser/frame_host/interstitial_page_impl.cc » ('j') | content/browser/web_contents/web_contents_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/interstitial_page_impl.h

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

index 28d2a0f501389dcf3d5b060b2c7948e759a135f6..a6e95a15302a1ff7d257e30d381a737d375967a4 100644

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

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

@@ -181,8 +181,8 @@ class CONTENT_EXPORT InterstitialPageImpl

// - any command sent by the RenderViewHost will be ignored.

void Disable();

- // Shutdown the RVH. We will be deleted by the time this method returns.

- void Shutdown(RenderViewHostImpl* render_view_host);

+ // Delete ourselves, causing Shutdown on the RVH to be called.

+ void Shutdown();

void OnNavigatingAwayOrTabClosing();

@@ -230,6 +230,8 @@ class CONTENT_EXPORT InterstitialPageImpl

// The RenderViewHost displaying the interstitial contents. This is valid

// until Hide is called, at which point it will be set to NULL, signifying

// that shutdown has started.

+ // TODO(creis): This is now owned by the FrameTree. We should route things

+ // through the tree's root RenderFrameHost instead.

RenderViewHostImpl* render_view_host_;

// The frame tree structure of the current page.