OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/resource_dispatcher_host.h" | 7 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/tab_contents/web_contents.h" | 35 #include "chrome/browser/tab_contents/web_contents.h" |
36 #include "chrome/common/notification_service.h" | 36 #include "chrome/common/notification_service.h" |
37 #include "chrome/common/render_messages.h" | 37 #include "chrome/common/render_messages.h" |
38 #include "chrome/common/stl_util-inl.h" | 38 #include "chrome/common/stl_util-inl.h" |
39 #include "net/base/auth.h" | 39 #include "net/base/auth.h" |
40 #include "net/base/cert_status_flags.h" | 40 #include "net/base/cert_status_flags.h" |
41 #include "net/base/load_flags.h" | 41 #include "net/base/load_flags.h" |
42 #include "net/base/mime_util.h" | 42 #include "net/base/mime_util.h" |
43 #include "net/base/net_errors.h" | 43 #include "net/base/net_errors.h" |
44 #include "net/url_request/url_request.h" | 44 #include "net/url_request/url_request.h" |
| 45 #include "webkit/glue/webappcachecontext.h" |
45 | 46 |
46 // TODO(port): Move these includes to the above section when porting is done. | 47 // TODO(port): Move these includes to the above section when porting is done. |
47 #if defined(OS_POSIX) | 48 #if defined(OS_POSIX) |
48 #include "chrome/common/temp_scaffolding_stubs.h" | 49 #include "chrome/common/temp_scaffolding_stubs.h" |
49 #elif defined(OS_WIN) | 50 #elif defined(OS_WIN) |
50 #include "chrome/browser/login_prompt.h" | 51 #include "chrome/browser/login_prompt.h" |
51 #include "chrome/browser/renderer_host/render_view_host_delegate.h" | 52 #include "chrome/browser/renderer_host/render_view_host_delegate.h" |
52 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 53 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
53 #endif | 54 #endif |
54 | 55 |
(...skipping 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
902 | 903 |
903 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 904 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
904 | 905 |
905 response->response_head.status = request->status(); | 906 response->response_head.status = request->status(); |
906 response->response_head.request_time = request->request_time(); | 907 response->response_head.request_time = request->request_time(); |
907 response->response_head.response_time = request->response_time(); | 908 response->response_head.response_time = request->response_time(); |
908 response->response_head.headers = request->response_headers(); | 909 response->response_head.headers = request->response_headers(); |
909 request->GetCharset(&response->response_head.charset); | 910 request->GetCharset(&response->response_head.charset); |
910 response->response_head.filter_policy = info->filter_policy; | 911 response->response_head.filter_policy = info->filter_policy; |
911 response->response_head.content_length = request->GetExpectedContentSize(); | 912 response->response_head.content_length = request->GetExpectedContentSize(); |
| 913 response->response_head.app_cache_id = WebAppCacheContext::kNoAppCacheId; |
912 request->GetMimeType(&response->response_head.mime_type); | 914 request->GetMimeType(&response->response_head.mime_type); |
913 | 915 |
914 // Make sure we don't get a file handle if LOAD_ENABLE_FILE is not set. | 916 // Make sure we don't get a file handle if LOAD_ENABLE_FILE is not set. |
915 DCHECK((request->load_flags() & net::LOAD_ENABLE_DOWNLOAD_FILE) || | 917 DCHECK((request->load_flags() & net::LOAD_ENABLE_DOWNLOAD_FILE) || |
916 request->response_data_file() == base::kInvalidPlatformFileValue); | 918 request->response_data_file() == base::kInvalidPlatformFileValue); |
917 #if defined(OS_POSIX) | 919 #if defined(OS_POSIX) |
918 response->response_head.response_data_file.fd = request->response_data_file(); | 920 response->response_head.response_data_file.fd = request->response_data_file(); |
919 #elif defined(OS_WIN) | 921 #elif defined(OS_WIN) |
920 response->response_head.response_data_file = request->response_data_file(); | 922 response->response_head.response_data_file = request->response_data_file(); |
921 #endif | 923 #endif |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1552 case ViewHostMsg_UploadProgress_ACK::ID: | 1554 case ViewHostMsg_UploadProgress_ACK::ID: |
1553 case ViewHostMsg_SyncLoad::ID: | 1555 case ViewHostMsg_SyncLoad::ID: |
1554 return true; | 1556 return true; |
1555 | 1557 |
1556 default: | 1558 default: |
1557 break; | 1559 break; |
1558 } | 1560 } |
1559 | 1561 |
1560 return false; | 1562 return false; |
1561 } | 1563 } |
OLD | NEW |