Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 30323002: [DRAFT] Create RenderFrameHostManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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
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 4bcee6955162f7297950036742a349c2c34e1851..77aaa6276ba4e552345e2e95d377a730922c52cf 100644
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -154,6 +154,9 @@ InterstitialPageImpl::InterstitialPageImpl(
enabled_(true),
action_taken_(NO_ACTION),
render_view_host_(NULL),
+ // TODO(creis): Is it sane for an interstitial page to have a RVHM?
+ // Do we need to be its delegate?
+ frame_tree_(this, this, NULL),
original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
should_revert_web_contents_title_(false),
@@ -229,7 +232,6 @@ void InterstitialPageImpl::Show() {
DCHECK(!render_view_host_);
render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost());
- render_view_host_->AttachToFrameTree();
CreateWebContentsView();
std::string data_url = "data:text/html;charset=utf-8," +
@@ -283,7 +285,7 @@ void InterstitialPageImpl::Hide() {
weak_ptr_factory_.GetWeakPtr(),
render_view_host_));
render_view_host_ = NULL;
- frame_tree_.SwapMainFrame(NULL);
+ //frame_tree_.SwapMainFrame(NULL);
controller_->delegate()->DetachInterstitialPage();
// Let's revert to the original title if necessary.
NavigationEntry* entry = controller_->GetVisibleEntry();
« no previous file with comments | « content/browser/frame_host/frame_tree_unittest.cc ('k') | content/browser/frame_host/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698