| 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/child_process_security_policy_impl.h" | 9 #include "content/browser/child_process_security_policy_impl.h" |
| 10 #include "content/browser/devtools/render_frame_devtools_agent_host.h" | 10 #include "content/browser/devtools/render_frame_devtools_agent_host.h" |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 common_params_.url); | 293 common_params_.url); |
| 294 | 294 |
| 295 // Inform the NavigationHandle that the navigation will commit. | 295 // Inform the NavigationHandle that the navigation will commit. |
| 296 navigation_handle_->ReadyToCommitNavigation(render_frame_host); | 296 navigation_handle_->ReadyToCommitNavigation(render_frame_host); |
| 297 | 297 |
| 298 CommitNavigation(); | 298 CommitNavigation(); |
| 299 } | 299 } |
| 300 | 300 |
| 301 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { | 301 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { |
| 302 // TODO(nasko): Update the NavigationHandle creation to ensure that the | 302 // TODO(nasko): Update the NavigationHandle creation to ensure that the |
| 303 // proper values are specified for is_synchronous and is_srcdoc. | 303 // proper values are specified for is_same_page and is_srcdoc. |
| 304 navigation_handle_ = NavigationHandleImpl::Create( | 304 navigation_handle_ = NavigationHandleImpl::Create( |
| 305 common_params_.url, frame_tree_node_, !browser_initiated_, | 305 common_params_.url, frame_tree_node_, !browser_initiated_, |
| 306 false, // is_synchronous | 306 false, // is_same_page |
| 307 false, // is_srcdoc | 307 false, // is_srcdoc |
| 308 common_params_.navigation_start, pending_nav_entry_id, | 308 common_params_.navigation_start, pending_nav_entry_id, |
| 309 false); // started_in_context_menu | 309 false); // started_in_context_menu |
| 310 } | 310 } |
| 311 | 311 |
| 312 void NavigationRequest::TransferNavigationHandleOwnership( | 312 void NavigationRequest::TransferNavigationHandleOwnership( |
| 313 RenderFrameHostImpl* render_frame_host) { | 313 RenderFrameHostImpl* render_frame_host) { |
| 314 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); | 314 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); |
| 315 } | 315 } |
| 316 | 316 |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 589 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
| 590 | 590 |
| 591 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 591 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 592 common_params_, request_params_, | 592 common_params_, request_params_, |
| 593 is_view_source_); | 593 is_view_source_); |
| 594 | 594 |
| 595 frame_tree_node_->ResetNavigationRequest(true); | 595 frame_tree_node_->ResetNavigationRequest(true); |
| 596 } | 596 } |
| 597 | 597 |
| 598 } // namespace content | 598 } // namespace content |
| OLD | NEW |