Chromium Code Reviews| 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 01ab901fe7d5e6c5bc9b4752cdfc21728f030c2c..8c9f0332d62ca36934acfa1dd85c16691fa8e209 100644 |
| --- a/content/browser/frame_host/navigation_controller_impl.cc |
| +++ b/content/browser/frame_host/navigation_controller_impl.cc |
| @@ -731,6 +731,13 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) { |
| params.is_renderer_initiated, |
| params.extra_headers, |
| browser_context_)); |
| + if (!params.frame_name.empty()) { |
| + // This is only used for navigating subframes in tests. |
| + FrameTreeNode* named_frame = |
| + delegate_->GetFrameTree()->FindByName(params.frame_name); |
| + if (named_frame) |
| + entry->set_frame_tree_node_id(named_frame->frame_tree_node_id()); |
| + } |
| if (params.frame_tree_node_id != -1) |
| entry->set_frame_tree_node_id(params.frame_tree_node_id); |
|
alexmos
2015/04/23 23:32:54
Could it ever be the case that params specify both
Charlie Reis
2015/04/24 18:30:54
It's theoretically possible to set both in a test,
|
| entry->set_source_site_instance( |
| @@ -745,7 +752,6 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) { |
| entry->SetIsOverridingUserAgent(override); |
| entry->set_transferred_global_request_id( |
| params.transferred_global_request_id); |
| - entry->SetFrameToNavigate(params.frame_name); |
| #if defined(OS_ANDROID) |
| if (params.intent_received_timestamp > 0) { |