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 "content/browser/frame_host/frame_tree.h" | 7 #include "content/browser/frame_host/frame_tree.h" |
8 #include "content/browser/frame_host/frame_tree_node.h" | 8 #include "content/browser/frame_host/frame_tree_node.h" |
9 #include "content/browser/frame_host/navigation_controller_impl.h" | 9 #include "content/browser/frame_host/navigation_controller_impl.h" |
10 #include "content/browser/frame_host/navigation_handle_impl.h" | 10 #include "content/browser/frame_host/navigation_handle_impl.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 int current_history_list_offset, | 119 int current_history_list_offset, |
120 int current_history_list_length) { | 120 int current_history_list_length) { |
121 // TODO(clamy): Check if some PageState should be provided here. | 121 // TODO(clamy): Check if some PageState should be provided here. |
122 // TODO(clamy): See how we should handle override of the user agent when the | 122 // TODO(clamy): See how we should handle override of the user agent when the |
123 // navigation may start in a renderer and commit in another one. | 123 // navigation may start in a renderer and commit in another one. |
124 // TODO(clamy): See if the navigation start time should be measured in the | 124 // TODO(clamy): See if the navigation start time should be measured in the |
125 // renderer and sent to the browser instead of being measured here. | 125 // renderer and sent to the browser instead of being measured here. |
126 // TODO(clamy): The pending history list offset should be properly set. | 126 // TODO(clamy): The pending history list offset should be properly set. |
127 // TODO(clamy): Set has_committed_real_load. | 127 // TODO(clamy): Set has_committed_real_load. |
128 RequestNavigationParams request_params( | 128 RequestNavigationParams request_params( |
129 false, // is_overriding_user_agent | 129 false, // is_overriding_user_agent |
130 std::vector<GURL>(), // redirects | 130 std::vector<GURL>(), // redirects |
131 false, // can_load_local_resources | 131 false, // can_load_local_resources |
132 base::Time::Now(), // request_time | 132 base::Time::Now(), // request_time |
133 PageState(), // page_state | 133 PageState(), // page_state |
134 -1, // page_id | 134 ExplodedFrameState(), // frame_state |
135 0, // nav_entry_id | 135 -1, // page_id |
136 false, // is_same_document_history_load | 136 0, // nav_entry_id |
137 false, // has_committed_real_load | 137 false, // is_same_document_history_load |
138 false, // intended_as_new_entry | 138 false, // has_committed_real_load |
139 -1, // pending_history_list_offset | 139 false, // intended_as_new_entry |
| 140 -1, // pending_history_list_offset |
140 current_history_list_offset, current_history_list_length, | 141 current_history_list_offset, current_history_list_length, |
141 false); // should_clear_history_list | 142 false); // should_clear_history_list |
142 scoped_ptr<NavigationRequest> navigation_request( | 143 scoped_ptr<NavigationRequest> navigation_request( |
143 new NavigationRequest(frame_tree_node, common_params, begin_params, | 144 new NavigationRequest(frame_tree_node, common_params, begin_params, |
144 request_params, body, false, nullptr, nullptr)); | 145 request_params, body, false, nullptr, nullptr)); |
145 return navigation_request.Pass(); | 146 return navigation_request.Pass(); |
146 } | 147 } |
147 | 148 |
148 NavigationRequest::NavigationRequest( | 149 NavigationRequest::NavigationRequest( |
149 FrameTreeNode* frame_tree_node, | 150 FrameTreeNode* frame_tree_node, |
150 const CommonNavigationParams& common_params, | 151 const CommonNavigationParams& common_params, |
151 const BeginNavigationParams& begin_params, | 152 const BeginNavigationParams& begin_params, |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 browser_context, navigating_frame_host->GetSiteInstance()); | 343 browser_context, navigating_frame_host->GetSiteInstance()); |
343 DCHECK(partition); | 344 DCHECK(partition); |
344 | 345 |
345 ServiceWorkerContextWrapper* service_worker_context = | 346 ServiceWorkerContextWrapper* service_worker_context = |
346 static_cast<ServiceWorkerContextWrapper*>( | 347 static_cast<ServiceWorkerContextWrapper*>( |
347 partition->GetServiceWorkerContext()); | 348 partition->GetServiceWorkerContext()); |
348 navigation_handle_->InitServiceWorkerHandle(service_worker_context); | 349 navigation_handle_->InitServiceWorkerHandle(service_worker_context); |
349 } | 350 } |
350 | 351 |
351 } // namespace content | 352 } // namespace content |
OLD | NEW |