| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/navigation_request.h" | 5 #include "content/browser/frame_host/navigation_request.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" | 9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 // Select an appropriate renderer to commit the navigation. | 379 // Select an appropriate renderer to commit the navigation. |
| 380 RenderFrameHostImpl* render_frame_host = | 380 RenderFrameHostImpl* render_frame_host = |
| 381 frame_tree_node_->render_manager()->GetFrameHostForNavigation(*this); | 381 frame_tree_node_->render_manager()->GetFrameHostForNavigation(*this); |
| 382 NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(render_frame_host, | 382 NavigatorImpl::CheckWebUIRendererDoesNotDisplayNormalURL(render_frame_host, |
| 383 common_params_.url); | 383 common_params_.url); |
| 384 | 384 |
| 385 // For renderer-initiated navigations that are set to commit in a different | 385 // For renderer-initiated navigations that are set to commit in a different |
| 386 // renderer, allow the embedder to cancel the transfer. | 386 // renderer, allow the embedder to cancel the transfer. |
| 387 if (!browser_initiated_ && | 387 if (!browser_initiated_ && |
| 388 render_frame_host != frame_tree_node_->current_frame_host() && | 388 render_frame_host != frame_tree_node_->current_frame_host() && |
| 389 !frame_tree_node_->navigator() | 389 !frame_tree_node_->navigator()->GetDelegate()->ShouldTransferNavigation( |
| 390 ->GetDelegate() | 390 frame_tree_node_->IsMainFrame())) { |
| 391 ->ShouldTransferNavigation()) { | |
| 392 frame_tree_node_->ResetNavigationRequest(false); | 391 frame_tree_node_->ResetNavigationRequest(false); |
| 393 return; | 392 return; |
| 394 } | 393 } |
| 395 | 394 |
| 396 if (navigation_data) | 395 if (navigation_data) |
| 397 navigation_handle_->set_navigation_data(std::move(navigation_data)); | 396 navigation_handle_->set_navigation_data(std::move(navigation_data)); |
| 398 | 397 |
| 399 // Store the response and the StreamHandle until checks have been processed. | 398 // Store the response and the StreamHandle until checks have been processed. |
| 400 response_ = response; | 399 response_ = response; |
| 401 body_ = std::move(body); | 400 body_ = std::move(body); |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 | 545 |
| 547 TransferNavigationHandleOwnership(render_frame_host); | 546 TransferNavigationHandleOwnership(render_frame_host); |
| 548 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 547 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 549 common_params_, request_params_, | 548 common_params_, request_params_, |
| 550 is_view_source_); | 549 is_view_source_); |
| 551 | 550 |
| 552 frame_tree_node_->ResetNavigationRequest(true); | 551 frame_tree_node_->ResetNavigationRequest(true); |
| 553 } | 552 } |
| 554 | 553 |
| 555 } // namespace content | 554 } // namespace content |
| OLD | NEW |