| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 common_params_.url); | 233 common_params_.url); |
| 234 | 234 |
| 235 // Inform the NavigationHandle that the navigation will commit. | 235 // Inform the NavigationHandle that the navigation will commit. |
| 236 navigation_handle_->ReadyToCommitNavigation(render_frame_host); | 236 navigation_handle_->ReadyToCommitNavigation(render_frame_host); |
| 237 | 237 |
| 238 CommitNavigation(); | 238 CommitNavigation(); |
| 239 } | 239 } |
| 240 | 240 |
| 241 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { | 241 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { |
| 242 // TODO(nasko): Update the NavigationHandle creation to ensure that the | 242 // TODO(nasko): Update the NavigationHandle creation to ensure that the |
| 243 // proper values are specified for is_synchronous and is_srcdoc. | 243 // proper values are specified for is_same_page and is_srcdoc. |
| 244 navigation_handle_ = NavigationHandleImpl::Create( | 244 navigation_handle_ = NavigationHandleImpl::Create( |
| 245 common_params_.url, frame_tree_node_, | 245 common_params_.url, frame_tree_node_, |
| 246 !browser_initiated_, | 246 !browser_initiated_, |
| 247 false, // is_synchronous | 247 false, // is_same_page |
| 248 false, // is_srcdoc | 248 false, // is_srcdoc |
| 249 common_params_.navigation_start, pending_nav_entry_id); | 249 common_params_.navigation_start, pending_nav_entry_id); |
| 250 } | 250 } |
| 251 | 251 |
| 252 void NavigationRequest::TransferNavigationHandleOwnership( | 252 void NavigationRequest::TransferNavigationHandleOwnership( |
| 253 RenderFrameHostImpl* render_frame_host) { | 253 RenderFrameHostImpl* render_frame_host) { |
| 254 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); | 254 render_frame_host->SetNavigationHandle(std::move(navigation_handle_)); |
| 255 } | 255 } |
| 256 | 256 |
| 257 void NavigationRequest::OnRequestRedirected( | 257 void NavigationRequest::OnRequestRedirected( |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 460 | 460 |
| 461 TransferNavigationHandleOwnership(render_frame_host); | 461 TransferNavigationHandleOwnership(render_frame_host); |
| 462 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 462 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 463 common_params_, request_params_, | 463 common_params_, request_params_, |
| 464 is_view_source_); | 464 is_view_source_); |
| 465 | 465 |
| 466 frame_tree_node_->ResetNavigationRequest(true); | 466 frame_tree_node_->ResetNavigationRequest(true); |
| 467 } | 467 } |
| 468 | 468 |
| 469 } // namespace content | 469 } // namespace content |
| OLD | NEW |