| 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();
|
|
|