| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc
e-loading | 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc
e-loading |
| 6 | 6 |
| 7 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 7 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 response->status = request->status(); | 203 response->status = request->status(); |
| 204 response->request_time = request->request_time(); | 204 response->request_time = request->request_time(); |
| 205 response->response_time = request->response_time(); | 205 response->response_time = request->response_time(); |
| 206 response->headers = request->response_headers(); | 206 response->headers = request->response_headers(); |
| 207 request->GetCharset(&response->charset); | 207 request->GetCharset(&response->charset); |
| 208 response->content_length = request->GetExpectedContentSize(); | 208 response->content_length = request->GetExpectedContentSize(); |
| 209 request->GetMimeType(&response->mime_type); | 209 request->GetMimeType(&response->mime_type); |
| 210 net::HttpResponseInfo response_info = request->response_info(); | 210 net::HttpResponseInfo response_info = request->response_info(); |
| 211 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy; | 211 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy; |
| 212 response->was_npn_negotiated = response_info.was_npn_negotiated; | 212 response->was_npn_negotiated = response_info.was_npn_negotiated; |
| 213 response->npn_negotiated_protocol = response_info.npn_negotiated_protocol; |
| 213 response->was_fetched_via_proxy = request->was_fetched_via_proxy(); | 214 response->was_fetched_via_proxy = request->was_fetched_via_proxy(); |
| 214 response->socket_address = request->GetSocketAddress(); | 215 response->socket_address = request->GetSocketAddress(); |
| 215 appcache::AppCacheInterceptor::GetExtraResponseInfo( | 216 appcache::AppCacheInterceptor::GetExtraResponseInfo( |
| 216 request, | 217 request, |
| 217 &response->appcache_id, | 218 &response->appcache_id, |
| 218 &response->appcache_manifest_url); | 219 &response->appcache_manifest_url); |
| 219 } | 220 } |
| 220 | 221 |
| 221 void RemoveDownloadFileFromChildSecurityPolicy(int child_id, | 222 void RemoveDownloadFileFromChildSecurityPolicy(int child_id, |
| 222 const FilePath& path) { | 223 const FilePath& path) { |
| (...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2282 scoped_refptr<ResourceHandler> transferred_resource_handler( | 2283 scoped_refptr<ResourceHandler> transferred_resource_handler( |
| 2283 new DoomedResourceHandler(info->resource_handler())); | 2284 new DoomedResourceHandler(info->resource_handler())); |
| 2284 info->set_resource_handler(transferred_resource_handler.get()); | 2285 info->set_resource_handler(transferred_resource_handler.get()); |
| 2285 } | 2286 } |
| 2286 | 2287 |
| 2287 bool ResourceDispatcherHost::IsTransferredNavigation( | 2288 bool ResourceDispatcherHost::IsTransferredNavigation( |
| 2288 const content::GlobalRequestID& transferred_request_id) const { | 2289 const content::GlobalRequestID& transferred_request_id) const { |
| 2289 return transferred_navigations_.find(transferred_request_id) != | 2290 return transferred_navigations_.find(transferred_request_id) != |
| 2290 transferred_navigations_.end(); | 2291 transferred_navigations_.end(); |
| 2291 } | 2292 } |
| OLD | NEW |