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