Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/render_frame_host_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 370 delegate_->GetOuterDelegateFrameTreeNodeId()); | 370 delegate_->GetOuterDelegateFrameTreeNodeId()); |
| 371 DCHECK(outer_delegate_frame_tree_node->parent()); | 371 DCHECK(outer_delegate_frame_tree_node->parent()); |
| 372 outer_delegate_frame_tree_node->frame_tree()->RemoveFrame( | 372 outer_delegate_frame_tree_node->frame_tree()->RemoveFrame( |
| 373 outer_delegate_frame_tree_node); | 373 outer_delegate_frame_tree_node); |
| 374 } | 374 } |
| 375 | 375 |
| 376 RenderFrameHostImpl* RenderFrameHostManager::Navigate( | 376 RenderFrameHostImpl* RenderFrameHostManager::Navigate( |
| 377 const GURL& dest_url, | 377 const GURL& dest_url, |
| 378 const FrameNavigationEntry& frame_entry, | 378 const FrameNavigationEntry& frame_entry, |
| 379 const NavigationEntryImpl& entry) { | 379 const NavigationEntryImpl& entry) { |
| 380 TRACE_EVENT1("navigation", "RenderFrameHostManager:Navigate", | 380 TRACE_EVENT1("navigation", "RenderFrameHostManager::Navigate", |
|
carlosk
2015/12/21 11:19:25
I reverted this change because I found references
| |
| 381 "FrameTreeNode id", frame_tree_node_->frame_tree_node_id()); | 381 "FrameTreeNode id", frame_tree_node_->frame_tree_node_id()); |
| 382 // Create a pending RenderFrameHost to use for the navigation. | 382 // Create a pending RenderFrameHost to use for the navigation. |
| 383 RenderFrameHostImpl* dest_render_frame_host = UpdateStateForNavigate( | 383 RenderFrameHostImpl* dest_render_frame_host = UpdateStateForNavigate( |
| 384 dest_url, | 384 dest_url, |
| 385 // TODO(creis): Move source_site_instance to FNE. | 385 // TODO(creis): Move source_site_instance to FNE. |
| 386 entry.source_site_instance(), frame_entry.site_instance(), | 386 entry.source_site_instance(), frame_entry.site_instance(), |
| 387 entry.GetTransitionType(), | 387 entry.GetTransitionType(), |
| 388 entry.restore_type() != NavigationEntryImpl::RESTORE_NONE, | 388 entry.restore_type() != NavigationEntryImpl::RESTORE_NONE, |
| 389 entry.IsViewSourceMode(), entry.transferred_global_request_id(), | 389 entry.IsViewSourceMode(), entry.transferred_global_request_id(), |
| 390 entry.bindings()); | 390 entry.bindings()); |
| (...skipping 2278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2669 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { | 2669 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { |
| 2670 if (!frame_tree_node_->opener()) | 2670 if (!frame_tree_node_->opener()) |
| 2671 return MSG_ROUTING_NONE; | 2671 return MSG_ROUTING_NONE; |
| 2672 | 2672 |
| 2673 return frame_tree_node_->opener() | 2673 return frame_tree_node_->opener() |
| 2674 ->render_manager() | 2674 ->render_manager() |
| 2675 ->GetRoutingIdForSiteInstance(instance); | 2675 ->GetRoutingIdForSiteInstance(instance); |
| 2676 } | 2676 } |
| 2677 | 2677 |
| 2678 } // namespace content | 2678 } // namespace content |
| OLD | NEW |