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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 // While the navigation was started via the LoadURL path it may have come from | 212 // While the navigation was started via the LoadURL path it may have come from |
213 // the renderer in the first place as part of OpenURL. | 213 // the renderer in the first place as part of OpenURL. |
214 bool browser_initiated = !entry.is_renderer_initiated(); | 214 bool browser_initiated = !entry.is_renderer_initiated(); |
215 | 215 |
216 CommonNavigationParams common_params = entry.ConstructCommonNavigationParams( | 216 CommonNavigationParams common_params = entry.ConstructCommonNavigationParams( |
217 frame_entry, request_body, dest_url, dest_referrer, navigation_type, | 217 frame_entry, request_body, dest_url, dest_referrer, navigation_type, |
218 previews_state, navigation_start); | 218 previews_state, navigation_start); |
219 | 219 |
220 std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest( | 220 std::unique_ptr<NavigationRequest> navigation_request(new NavigationRequest( |
221 frame_tree_node, common_params, | 221 frame_tree_node, common_params, |
222 BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL, | 222 BeginNavigationParams( |
223 false, // has_user_gestures | 223 entry.extra_headers(), net::LOAD_NORMAL, |
224 false, // skip_service_worker | 224 false, // has_user_gestures |
225 REQUEST_CONTEXT_TYPE_LOCATION, | 225 false, // skip_service_worker |
226 blink::WebMixedContentContextType::Blockable, | 226 REQUEST_CONTEXT_TYPE_LOCATION, |
227 initiator), | 227 blink::WebMixedContentContextType::Blockable, initiator, |
| 228 kInvalidRenderNavigationId), // renderer_navigation_id |
228 entry.ConstructRequestNavigationParams( | 229 entry.ConstructRequestNavigationParams( |
229 frame_entry, common_params.url, common_params.method, | 230 frame_entry, common_params.url, common_params.method, |
230 is_history_navigation_in_new_child, | 231 is_history_navigation_in_new_child, |
231 entry.GetSubframeUniqueNames(frame_tree_node), | 232 entry.GetSubframeUniqueNames(frame_tree_node), |
232 frame_tree_node->has_committed_real_load(), | 233 frame_tree_node->has_committed_real_load(), |
233 controller->GetPendingEntryIndex() == -1, | 234 controller->GetPendingEntryIndex() == -1, |
234 controller->GetIndexOfEntry(&entry), | 235 controller->GetIndexOfEntry(&entry), |
235 controller->GetLastCommittedEntryIndex(), | 236 controller->GetLastCommittedEntryIndex(), |
236 controller->GetEntryCount()), | 237 controller->GetEntryCount()), |
237 browser_initiated, | 238 browser_initiated, |
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); | 814 DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture); |
814 | 815 |
815 render_frame_host->CommitNavigation(response_.get(), std::move(body_), | 816 render_frame_host->CommitNavigation(response_.get(), std::move(body_), |
816 common_params_, request_params_, | 817 common_params_, request_params_, |
817 is_view_source_); | 818 is_view_source_); |
818 | 819 |
819 frame_tree_node_->ResetNavigationRequest(true); | 820 frame_tree_node_->ResetNavigationRequest(true); |
820 } | 821 } |
821 | 822 |
822 } // namespace content | 823 } // namespace content |
OLD | NEW |