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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/ref_counted_memory.h" | 8 #include "base/memory/ref_counted_memory.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/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 should_clear_history_list(false), | 130 should_clear_history_list(false), |
131 should_create_service_worker(false), | 131 should_create_service_worker(false), |
132 service_worker_provider_id(kInvalidServiceWorkerProviderId) {} | 132 service_worker_provider_id(kInvalidServiceWorkerProviderId) {} |
133 | 133 |
134 RequestNavigationParams::RequestNavigationParams( | 134 RequestNavigationParams::RequestNavigationParams( |
135 bool is_overriding_user_agent, | 135 bool is_overriding_user_agent, |
136 const std::vector<GURL>& redirects, | 136 const std::vector<GURL>& redirects, |
137 bool can_load_local_resources, | 137 bool can_load_local_resources, |
138 base::Time request_time, | 138 base::Time request_time, |
139 const PageState& page_state, | 139 const PageState& page_state, |
| 140 const ExplodedFrameState& frame_state, |
140 int32 page_id, | 141 int32 page_id, |
141 int nav_entry_id, | 142 int nav_entry_id, |
142 bool is_same_document_history_load, | 143 bool is_same_document_history_load, |
143 bool has_committed_real_load, | 144 bool has_committed_real_load, |
144 bool intended_as_new_entry, | 145 bool intended_as_new_entry, |
145 int pending_history_list_offset, | 146 int pending_history_list_offset, |
146 int current_history_list_offset, | 147 int current_history_list_offset, |
147 int current_history_list_length, | 148 int current_history_list_length, |
148 bool should_clear_history_list) | 149 bool should_clear_history_list) |
149 : is_overriding_user_agent(is_overriding_user_agent), | 150 : is_overriding_user_agent(is_overriding_user_agent), |
150 redirects(redirects), | 151 redirects(redirects), |
151 can_load_local_resources(can_load_local_resources), | 152 can_load_local_resources(can_load_local_resources), |
152 request_time(request_time), | 153 request_time(request_time), |
153 page_state(page_state), | 154 page_state(page_state), |
| 155 frame_state(frame_state), |
154 page_id(page_id), | 156 page_id(page_id), |
155 nav_entry_id(nav_entry_id), | 157 nav_entry_id(nav_entry_id), |
156 is_same_document_history_load(is_same_document_history_load), | 158 is_same_document_history_load(is_same_document_history_load), |
157 has_committed_real_load(has_committed_real_load), | 159 has_committed_real_load(has_committed_real_load), |
158 intended_as_new_entry(intended_as_new_entry), | 160 intended_as_new_entry(intended_as_new_entry), |
159 pending_history_list_offset(pending_history_list_offset), | 161 pending_history_list_offset(pending_history_list_offset), |
160 current_history_list_offset(current_history_list_offset), | 162 current_history_list_offset(current_history_list_offset), |
161 current_history_list_length(current_history_list_length), | 163 current_history_list_length(current_history_list_length), |
162 should_clear_history_list(should_clear_history_list), | 164 should_clear_history_list(should_clear_history_list), |
163 should_create_service_worker(false), | 165 should_create_service_worker(false), |
164 service_worker_provider_id(kInvalidServiceWorkerProviderId) {} | 166 service_worker_provider_id(kInvalidServiceWorkerProviderId) {} |
165 | 167 |
166 RequestNavigationParams::~RequestNavigationParams() { | 168 RequestNavigationParams::~RequestNavigationParams() { |
167 } | 169 } |
168 | 170 |
169 NavigationParams::NavigationParams( | 171 NavigationParams::NavigationParams( |
170 const CommonNavigationParams& common_params, | 172 const CommonNavigationParams& common_params, |
171 const StartNavigationParams& start_params, | 173 const StartNavigationParams& start_params, |
172 const RequestNavigationParams& request_params) | 174 const RequestNavigationParams& request_params) |
173 : common_params(common_params), | 175 : common_params(common_params), |
174 start_params(start_params), | 176 start_params(start_params), |
175 request_params(request_params) { | 177 request_params(request_params) { |
176 } | 178 } |
177 | 179 |
178 NavigationParams::~NavigationParams() { | 180 NavigationParams::~NavigationParams() { |
179 } | 181 } |
180 | 182 |
181 } // namespace content | 183 } // namespace content |
OLD | NEW |