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