Chromium Code Reviews| Index: content/browser/frame_host/navigator_impl.cc |
| diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc |
| index 72f9f8702c8fa0509b62e2bbdbf6a67661c0bf9e..b944961a732dd54313d95ae190ccabdcd2a96175 100644 |
| --- a/content/browser/frame_host/navigator_impl.cc |
| +++ b/content/browser/frame_host/navigator_impl.cc |
| @@ -620,8 +620,13 @@ void NavigatorImpl::RequestTransferURL( |
| } |
| int64 frame_tree_node_id = -1; |
| + // Send the navigation to the current FrameTreeNode if it's destined for a |
|
nasko
2015/03/07 00:55:15
nit: I find it more readable if there is an empty
Charlie Reis
2015/03/07 03:23:28
Done.
|
| + // subframe in the current tab. We'll assume it's for the main frame |
| + // (possibly of a new or different WebContents) otherwise. |
| if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kSitePerProcess)) { |
| + switches::kSitePerProcess) && |
| + disposition == CURRENT_TAB && |
| + render_frame_host->GetParent()) { |
| frame_tree_node_id = |
| render_frame_host->frame_tree_node()->frame_tree_node_id(); |
| } |