OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 29 matching lines...) Expand all Loading... |
40 #include "chrome/browser/renderer_host/render_view_host_delegate.h" | 40 #include "chrome/browser/renderer_host/render_view_host_delegate.h" |
41 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" | 41 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" |
42 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" | 42 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" |
43 #include "chrome/browser/renderer_host/resource_queue.h" | 43 #include "chrome/browser/renderer_host/resource_queue.h" |
44 #include "chrome/browser/renderer_host/resource_request_details.h" | 44 #include "chrome/browser/renderer_host/resource_request_details.h" |
45 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" | 45 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" |
46 #include "chrome/browser/renderer_host/save_file_resource_handler.h" | 46 #include "chrome/browser/renderer_host/save_file_resource_handler.h" |
47 #include "chrome/browser/renderer_host/socket_stream_dispatcher_host.h" | 47 #include "chrome/browser/renderer_host/socket_stream_dispatcher_host.h" |
48 #include "chrome/browser/renderer_host/sync_resource_handler.h" | 48 #include "chrome/browser/renderer_host/sync_resource_handler.h" |
49 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 49 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 50 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
50 #include "chrome/browser/ssl/ssl_client_auth_handler.h" | 51 #include "chrome/browser/ssl/ssl_client_auth_handler.h" |
51 #include "chrome/browser/ssl/ssl_manager.h" | 52 #include "chrome/browser/ssl/ssl_manager.h" |
52 #include "chrome/browser/worker_host/worker_service.h" | 53 #include "chrome/browser/worker_host/worker_service.h" |
53 #include "chrome/common/chrome_switches.h" | 54 #include "chrome/common/chrome_switches.h" |
54 #include "chrome/common/extensions/extension_l10n_util.h" | 55 #include "chrome/common/extensions/extension_l10n_util.h" |
55 #include "chrome/common/notification_service.h" | 56 #include "chrome/common/notification_service.h" |
56 #include "chrome/common/render_messages.h" | 57 #include "chrome/common/render_messages.h" |
57 #include "net/base/auth.h" | 58 #include "net/base/auth.h" |
58 #include "net/base/cert_status_flags.h" | 59 #include "net/base/cert_status_flags.h" |
59 #include "net/base/load_flags.h" | 60 #include "net/base/load_flags.h" |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
974 } | 975 } |
975 | 976 |
976 void ResourceDispatcherHost::OnSSLCertificateError( | 977 void ResourceDispatcherHost::OnSSLCertificateError( |
977 URLRequest* request, | 978 URLRequest* request, |
978 int cert_error, | 979 int cert_error, |
979 net::X509Certificate* cert) { | 980 net::X509Certificate* cert) { |
980 DCHECK(request); | 981 DCHECK(request); |
981 SSLManager::OnSSLCertificateError(this, request, cert_error, cert); | 982 SSLManager::OnSSLCertificateError(this, request, cert_error, cert); |
982 } | 983 } |
983 | 984 |
| 985 void ResourceDispatcherHost::OnClientCertificateGenerated( |
| 986 URLRequest* request, |
| 987 net::X509Certificate* cert) { |
| 988 new SSLAddCertHandler(request, cert); |
| 989 // The handler will run the UI and delete itself when it's finished. |
| 990 } |
| 991 |
984 void ResourceDispatcherHost::OnSetCookieBlocked(URLRequest* request) { | 992 void ResourceDispatcherHost::OnSetCookieBlocked(URLRequest* request) { |
985 RESOURCE_LOG("OnSetCookieBlocked: " << request->url().spec()); | 993 RESOURCE_LOG("OnSetCookieBlocked: " << request->url().spec()); |
986 | 994 |
987 int render_process_id, render_view_id; | 995 int render_process_id, render_view_id; |
988 if (!RenderViewForRequest(request, &render_process_id, &render_view_id)) | 996 if (!RenderViewForRequest(request, &render_process_id, &render_view_id)) |
989 return; | 997 return; |
990 | 998 |
991 CallRenderViewHostResourceDelegate( | 999 CallRenderViewHostResourceDelegate( |
992 render_process_id, render_view_id, | 1000 render_process_id, render_view_id, |
993 &RenderViewHostDelegate::Resource::OnContentBlocked, | 1001 &RenderViewHostDelegate::Resource::OnContentBlocked, |
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1704 case ViewHostMsg_UploadProgress_ACK::ID: | 1712 case ViewHostMsg_UploadProgress_ACK::ID: |
1705 case ViewHostMsg_SyncLoad::ID: | 1713 case ViewHostMsg_SyncLoad::ID: |
1706 return true; | 1714 return true; |
1707 | 1715 |
1708 default: | 1716 default: |
1709 break; | 1717 break; |
1710 } | 1718 } |
1711 | 1719 |
1712 return false; | 1720 return false; |
1713 } | 1721 } |
OLD | NEW |