Chromium Code Reviews| 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 30 matching lines...) Expand all Loading... | |
| 41 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 41 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
| 42 #include "content/browser/renderer_host/resource_message_filter.h" | 42 #include "content/browser/renderer_host/resource_message_filter.h" |
| 43 #include "content/browser/renderer_host/resource_queue.h" | 43 #include "content/browser/renderer_host/resource_queue.h" |
| 44 #include "content/browser/renderer_host/resource_request_details.h" | 44 #include "content/browser/renderer_host/resource_request_details.h" |
| 45 #include "content/browser/renderer_host/sync_resource_handler.h" | 45 #include "content/browser/renderer_host/sync_resource_handler.h" |
| 46 #include "content/browser/renderer_host/throttling_resource_handler.h" | 46 #include "content/browser/renderer_host/throttling_resource_handler.h" |
| 47 #include "content/browser/ssl/ssl_client_auth_handler.h" | 47 #include "content/browser/ssl/ssl_client_auth_handler.h" |
| 48 #include "content/browser/ssl/ssl_manager.h" | 48 #include "content/browser/ssl/ssl_manager.h" |
| 49 #include "content/browser/worker_host/worker_service_impl.h" | 49 #include "content/browser/worker_host/worker_service_impl.h" |
| 50 #include "content/common/resource_messages.h" | 50 #include "content/common/resource_messages.h" |
| 51 #include "content/common/response_extra_data.h" | |
|
Ryan Sleevi
2012/02/17 05:37:08
Do you still need this header for this file?
ramant (doing other things)
2012/02/17 21:47:35
Done.
| |
| 51 #include "content/common/ssl_status_serialization.h" | 52 #include "content/common/ssl_status_serialization.h" |
| 52 #include "content/common/view_messages.h" | 53 #include "content/common/view_messages.h" |
| 53 #include "content/public/browser/browser_thread.h" | 54 #include "content/public/browser/browser_thread.h" |
| 54 #include "content/public/browser/content_browser_client.h" | 55 #include "content/public/browser/content_browser_client.h" |
| 55 #include "content/public/browser/download_manager.h" | 56 #include "content/public/browser/download_manager.h" |
| 56 #include "content/public/browser/global_request_id.h" | 57 #include "content/public/browser/global_request_id.h" |
| 57 #include "content/public/browser/notification_service.h" | 58 #include "content/public/browser/notification_service.h" |
| 58 #include "content/public/browser/render_view_host_delegate.h" | 59 #include "content/public/browser/render_view_host_delegate.h" |
| 59 #include "content/public/browser/resource_context.h" | 60 #include "content/public/browser/resource_context.h" |
| 60 #include "content/public/browser/resource_dispatcher_host_delegate.h" | 61 #include "content/public/browser/resource_dispatcher_host_delegate.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 response->status = request->status(); | 204 response->status = request->status(); |
| 204 response->request_time = request->request_time(); | 205 response->request_time = request->request_time(); |
| 205 response->response_time = request->response_time(); | 206 response->response_time = request->response_time(); |
| 206 response->headers = request->response_headers(); | 207 response->headers = request->response_headers(); |
| 207 request->GetCharset(&response->charset); | 208 request->GetCharset(&response->charset); |
| 208 response->content_length = request->GetExpectedContentSize(); | 209 response->content_length = request->GetExpectedContentSize(); |
| 209 request->GetMimeType(&response->mime_type); | 210 request->GetMimeType(&response->mime_type); |
| 210 net::HttpResponseInfo response_info = request->response_info(); | 211 net::HttpResponseInfo response_info = request->response_info(); |
| 211 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy; | 212 response->was_fetched_via_spdy = response_info.was_fetched_via_spdy; |
| 212 response->was_npn_negotiated = response_info.was_npn_negotiated; | 213 response->was_npn_negotiated = response_info.was_npn_negotiated; |
| 214 response->npn_negotiated_protocol = response_info.npn_negotiated_protocol; | |
| 213 response->was_fetched_via_proxy = request->was_fetched_via_proxy(); | 215 response->was_fetched_via_proxy = request->was_fetched_via_proxy(); |
| 214 response->socket_address = request->GetSocketAddress(); | 216 response->socket_address = request->GetSocketAddress(); |
| 215 appcache::AppCacheInterceptor::GetExtraResponseInfo( | 217 appcache::AppCacheInterceptor::GetExtraResponseInfo( |
| 216 request, | 218 request, |
| 217 &response->appcache_id, | 219 &response->appcache_id, |
| 218 &response->appcache_manifest_url); | 220 &response->appcache_manifest_url); |
| 219 } | 221 } |
| 220 | 222 |
| 221 void RemoveDownloadFileFromChildSecurityPolicy(int child_id, | 223 void RemoveDownloadFileFromChildSecurityPolicy(int child_id, |
| 222 const FilePath& path) { | 224 const FilePath& path) { |
| (...skipping 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2301 scoped_refptr<ResourceHandler> transferred_resource_handler( | 2303 scoped_refptr<ResourceHandler> transferred_resource_handler( |
| 2302 new DoomedResourceHandler(info->resource_handler())); | 2304 new DoomedResourceHandler(info->resource_handler())); |
| 2303 info->set_resource_handler(transferred_resource_handler.get()); | 2305 info->set_resource_handler(transferred_resource_handler.get()); |
| 2304 } | 2306 } |
| 2305 | 2307 |
| 2306 bool ResourceDispatcherHost::IsTransferredNavigation( | 2308 bool ResourceDispatcherHost::IsTransferredNavigation( |
| 2307 const content::GlobalRequestID& transferred_request_id) const { | 2309 const content::GlobalRequestID& transferred_request_id) const { |
| 2308 return transferred_navigations_.find(transferred_request_id) != | 2310 return transferred_navigations_.find(transferred_request_id) != |
| 2309 transferred_navigations_.end(); | 2311 transferred_navigations_.end(); |
| 2310 } | 2312 } |
| OLD | NEW |