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/common/navigation_params.h" | 5 #include "content/common/navigation_params.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/common/service_worker/service_worker_types.h" | 9 #include "content/common/service_worker/service_worker_types.h" |
10 #include "content/public/common/appcache_info.h" | 10 #include "content/public/common/appcache_info.h" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 should_clear_history_list(false), | 142 should_clear_history_list(false), |
143 should_create_service_worker(false), | 143 should_create_service_worker(false), |
144 service_worker_provider_id(kInvalidServiceWorkerProviderId), | 144 service_worker_provider_id(kInvalidServiceWorkerProviderId), |
145 appcache_host_id(kAppCacheNoHostId), | 145 appcache_host_id(kAppCacheNoHostId), |
146 has_user_gesture(false) { | 146 has_user_gesture(false) { |
147 } | 147 } |
148 | 148 |
149 RequestNavigationParams::RequestNavigationParams( | 149 RequestNavigationParams::RequestNavigationParams( |
150 bool is_overriding_user_agent, | 150 bool is_overriding_user_agent, |
151 const std::vector<GURL>& redirects, | 151 const std::vector<GURL>& redirects, |
| 152 const GURL& original_url, |
| 153 const std::string& original_method, |
152 bool can_load_local_resources, | 154 bool can_load_local_resources, |
153 const PageState& page_state, | 155 const PageState& page_state, |
154 int nav_entry_id, | 156 int nav_entry_id, |
155 bool is_history_navigation_in_new_child, | 157 bool is_history_navigation_in_new_child, |
156 std::map<std::string, bool> subframe_unique_names, | 158 std::map<std::string, bool> subframe_unique_names, |
157 bool has_committed_real_load, | 159 bool has_committed_real_load, |
158 bool intended_as_new_entry, | 160 bool intended_as_new_entry, |
159 int pending_history_list_offset, | 161 int pending_history_list_offset, |
160 int current_history_list_offset, | 162 int current_history_list_offset, |
161 int current_history_list_length, | 163 int current_history_list_length, |
162 bool is_view_source, | 164 bool is_view_source, |
163 bool should_clear_history_list, | 165 bool should_clear_history_list, |
164 bool has_user_gesture) | 166 bool has_user_gesture) |
165 : is_overriding_user_agent(is_overriding_user_agent), | 167 : is_overriding_user_agent(is_overriding_user_agent), |
166 redirects(redirects), | 168 redirects(redirects), |
| 169 original_url(original_url), |
| 170 original_method(original_method), |
167 can_load_local_resources(can_load_local_resources), | 171 can_load_local_resources(can_load_local_resources), |
168 page_state(page_state), | 172 page_state(page_state), |
169 nav_entry_id(nav_entry_id), | 173 nav_entry_id(nav_entry_id), |
170 is_history_navigation_in_new_child(is_history_navigation_in_new_child), | 174 is_history_navigation_in_new_child(is_history_navigation_in_new_child), |
171 subframe_unique_names(subframe_unique_names), | 175 subframe_unique_names(subframe_unique_names), |
172 has_committed_real_load(has_committed_real_load), | 176 has_committed_real_load(has_committed_real_load), |
173 intended_as_new_entry(intended_as_new_entry), | 177 intended_as_new_entry(intended_as_new_entry), |
174 pending_history_list_offset(pending_history_list_offset), | 178 pending_history_list_offset(pending_history_list_offset), |
175 current_history_list_offset(current_history_list_offset), | 179 current_history_list_offset(current_history_list_offset), |
176 current_history_list_length(current_history_list_length), | 180 current_history_list_length(current_history_list_length), |
177 is_view_source(is_view_source), | 181 is_view_source(is_view_source), |
178 should_clear_history_list(should_clear_history_list), | 182 should_clear_history_list(should_clear_history_list), |
179 should_create_service_worker(false), | 183 should_create_service_worker(false), |
180 service_worker_provider_id(kInvalidServiceWorkerProviderId), | 184 service_worker_provider_id(kInvalidServiceWorkerProviderId), |
181 appcache_host_id(kAppCacheNoHostId), | 185 appcache_host_id(kAppCacheNoHostId), |
182 has_user_gesture(has_user_gesture) { | 186 has_user_gesture(has_user_gesture) {} |
183 } | |
184 | 187 |
185 RequestNavigationParams::RequestNavigationParams( | 188 RequestNavigationParams::RequestNavigationParams( |
186 const RequestNavigationParams& other) = default; | 189 const RequestNavigationParams& other) = default; |
187 | 190 |
188 RequestNavigationParams::~RequestNavigationParams() { | 191 RequestNavigationParams::~RequestNavigationParams() { |
189 } | 192 } |
190 | 193 |
191 NavigationParams::NavigationParams( | 194 NavigationParams::NavigationParams( |
192 const CommonNavigationParams& common_params, | 195 const CommonNavigationParams& common_params, |
193 const StartNavigationParams& start_params, | 196 const StartNavigationParams& start_params, |
194 const RequestNavigationParams& request_params) | 197 const RequestNavigationParams& request_params) |
195 : common_params(common_params), | 198 : common_params(common_params), |
196 start_params(start_params), | 199 start_params(start_params), |
197 request_params(request_params) { | 200 request_params(request_params) { |
198 } | 201 } |
199 | 202 |
200 NavigationParams::~NavigationParams() { | 203 NavigationParams::~NavigationParams() { |
201 } | 204 } |
202 | 205 |
203 } // namespace content | 206 } // namespace content |
OLD | NEW |