| 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 common_params_.url); | 295 common_params_.url); |
| 296 | 296 |
| 297 // Inform the NavigationHandle that the navigation will commit. | 297 // Inform the NavigationHandle that the navigation will commit. |
| 298 navigation_handle_->ReadyToCommitNavigation(render_frame_host); | 298 navigation_handle_->ReadyToCommitNavigation(render_frame_host); |
| 299 | 299 |
| 300 CommitNavigation(); | 300 CommitNavigation(); |
| 301 } | 301 } |
| 302 | 302 |
| 303 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { | 303 void NavigationRequest::CreateNavigationHandle(int pending_nav_entry_id) { |
| 304 // TODO(nasko): Update the NavigationHandle creation to ensure that the | 304 // TODO(nasko): Update the NavigationHandle creation to ensure that the |
| 305 // proper values are specified for is_same_page and is_srcdoc. | 305 // proper values are specified for is_same_page. |
| 306 navigation_handle_ = NavigationHandleImpl::Create( | 306 navigation_handle_ = NavigationHandleImpl::Create( |
| 307 common_params_.url, frame_tree_node_, !browser_initiated_, | 307 common_params_.url, frame_tree_node_, !browser_initiated_, |
| 308 false, // is_same_page | 308 false, // is_same_page |
| 309 false, // is_srcdoc | |
| 310 common_params_.navigation_start, pending_nav_entry_id, | 309 common_params_.navigation_start, pending_nav_entry_id, |
| 311 common_params_.gesture, | 310 common_params_.gesture, |
| 312 false); // started_in_context_menu | 311 false); // started_in_context_menu |
| 313 | 312 |
| 314 if (!begin_params_.searchable_form_url.is_empty()) { | 313 if (!begin_params_.searchable_form_url.is_empty()) { |
| 315 navigation_handle_->set_searchable_form_url( | 314 navigation_handle_->set_searchable_form_url( |
| 316 begin_params_.searchable_form_url); | 315 begin_params_.searchable_form_url); |
| 317 navigation_handle_->set_searchable_form_encoding( | 316 navigation_handle_->set_searchable_form_encoding( |
| 318 begin_params_.searchable_form_encoding); | 317 begin_params_.searchable_form_encoding); |
| 319 } | 318 } |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 TransferNavigationHandleOwnership(render_frame_host); | 598 TransferNavigationHandleOwnership(render_frame_host); |
| 600 | 599 |
| 601 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 600 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
| 602 common_params_, request_params_, | 601 common_params_, request_params_, |
| 603 is_view_source_); | 602 is_view_source_); |
| 604 | 603 |
| 605 frame_tree_node_->ResetNavigationRequest(true); | 604 frame_tree_node_->ResetNavigationRequest(true); |
| 606 } | 605 } |
| 607 | 606 |
| 608 } // namespace content | 607 } // namespace content |
| OLD | NEW |