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 "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "content/browser/appcache/appcache_navigation_handle.h" | 10 #include "content/browser/appcache/appcache_navigation_handle.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 frame_entry, request_body, dest_url, dest_referrer, navigation_type, | 214 frame_entry, request_body, dest_url, dest_referrer, navigation_type, |
215 previews_state, navigation_start); | 215 previews_state, navigation_start); |
216 | 216 |
217 std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest( | 217 std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest( |
218 frame_tree_node, common_params, | 218 frame_tree_node, common_params, |
219 BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL, | 219 BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL, |
220 false, // has_user_gestures | 220 false, // has_user_gestures |
221 false, // skip_service_worker | 221 false, // skip_service_worker |
222 REQUEST_CONTEXT_TYPE_LOCATION, | 222 REQUEST_CONTEXT_TYPE_LOCATION, |
223 blink::WebMixedContentContextType::Blockable, | 223 blink::WebMixedContentContextType::Blockable, |
224 initiator), | 224 initiator, |
| 225 -1), // renderer_navigation_id |
225 entry.ConstructRequestNavigationParams( | 226 entry.ConstructRequestNavigationParams( |
226 frame_entry, common_params.url, common_params.method, | 227 frame_entry, common_params.url, common_params.method, |
227 is_history_navigation_in_new_child, | 228 is_history_navigation_in_new_child, |
228 entry.GetSubframeUniqueNames(frame_tree_node), | 229 entry.GetSubframeUniqueNames(frame_tree_node), |
229 frame_tree_node->has_committed_real_load(), | 230 frame_tree_node->has_committed_real_load(), |
230 controller->GetPendingEntryIndex() == -1, | 231 controller->GetPendingEntryIndex() == -1, |
231 controller->GetIndexOfEntry(&entry), | 232 controller->GetIndexOfEntry(&entry), |
232 controller->GetLastCommittedEntryIndex(), | 233 controller->GetLastCommittedEntryIndex(), |
233 controller->GetEntryCount()), | 234 controller->GetEntryCount()), |
234 browser_initiated, | 235 browser_initiated, |
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 775 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
775 | 776 |
776 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 777 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
777 common_params_, request_params_, | 778 common_params_, request_params_, |
778 is_view_source_); | 779 is_view_source_); |
779 | 780 |
780 frame_tree_node_->ResetNavigationRequest(true); | 781 frame_tree_node_->ResetNavigationRequest(true); |
781 } | 782 } |
782 | 783 |
783 } // namespace content | 784 } // namespace content |
OLD | NEW |