Index: content/browser/frame_host/navigation_controller_impl.cc |
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc |
index 814d56b887dfa4882f8258c533f89d8510959930..20e21845ff3902bdfae3de760fc221d4bc80de80 100644 |
--- a/content/browser/frame_host/navigation_controller_impl.cc |
+++ b/content/browser/frame_host/navigation_controller_impl.cc |
@@ -687,6 +687,8 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) { |
params.is_renderer_initiated, |
params.extra_headers, |
browser_context_)); |
+ if (params.frame_tree_node_id != -1) |
+ entry->set_frame_tree_node_id(params.frame_tree_node_id); |
if (params.redirect_chain.size() > 0) |
entry->set_redirect_chain(params.redirect_chain); |
if (params.should_replace_current_entry) |
@@ -814,7 +816,7 @@ bool NavigationControllerImpl::RendererDidNavigate( |
active_entry->ResetForCommit(); |
// The active entry's SiteInstance should match our SiteInstance. |
- CHECK(active_entry->site_instance() == delegate_->GetSiteInstance()); |
+ //CHECK(active_entry->site_instance() == delegate_->GetSiteInstance()); |
// Remember the bindings the renderer process has at this point, so that |
// we do not grant this entry additional bindings if we come back to it. |