| 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 8d33a46deaec930772d6981c03b29118115770de..4aa878bedc38aacb7c83971d7cd5c072ad720c02 100644
|
| --- a/content/browser/frame_host/interstitial_page_impl.cc
|
| +++ b/content/browser/frame_host/interstitial_page_impl.cc
|
| @@ -162,7 +162,8 @@ InterstitialPageImpl::InterstitialPageImpl(
|
| // TODO(creis): We will also need to pass delegates for the RVHM as we
|
| // start to use it.
|
| frame_tree_(new InterstitialPageNavigatorImpl(this, controller_),
|
| - this, this, this, NULL),
|
| + this, this, this,
|
| + static_cast<WebContentsImpl*>(web_contents)),
|
| original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
|
| original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
|
| should_revert_web_contents_title_(false),
|
| @@ -238,7 +239,8 @@ void InterstitialPageImpl::Show() {
|
|
|
| DCHECK(!render_view_host_);
|
| render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost());
|
| - render_view_host_->AttachToFrameTree();
|
| + // TODO(creis): Is this necessary? If so, move into CreateRenderViewHost.
|
| + frame_tree_.ResetForMainFrameSwap();
|
| CreateWebContentsView();
|
|
|
| std::string data_url = "data:text/html;charset=utf-8," +
|
|
|