Index: content/browser/renderer_host/resource_dispatcher_host.h |
diff --git a/content/browser/renderer_host/resource_dispatcher_host.h b/content/browser/renderer_host/resource_dispatcher_host.h |
index 80c9337e56944db5f1f14957f981e2176ea32b32..e039c05f2ceb3ba4310b3f4147924d803835c0b3 100644 |
--- a/content/browser/renderer_host/resource_dispatcher_host.h |
+++ b/content/browser/renderer_host/resource_dispatcher_host.h |
@@ -25,6 +25,7 @@ |
#include "base/timer.h" |
#include "content/browser/download/download_resource_handler.h" |
#include "content/browser/renderer_host/resource_queue.h" |
+#include "content/browser/ssl/ssl_error_handler.h" |
#include "content/common/content_export.h" |
#include "content/public/browser/child_process_data.h" |
#include "content/public/browser/notification_types.h" |
@@ -57,7 +58,9 @@ namespace webkit_blob { |
class DeletableFileReference; |
} |
-class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate { |
+class CONTENT_EXPORT ResourceDispatcherHost |
+ : public net::URLRequest::Delegate, |
+ public SSLErrorHandler::Delegate { |
public: |
ResourceDispatcherHost(); |
virtual ~ResourceDispatcherHost(); |
@@ -284,6 +287,23 @@ class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate { |
const DownloadSaveInfo& save_info, |
const DownloadResourceHandler::OnStartedCallback& started_cb); |
+ // SSLErrorHandler::Delegate |
wtc
2012/02/24 00:44:38
Nit: add ':' at the end of this line. Remove the b
Takashi Toyoshima
2012/02/28 20:55:43
Done.
|
+ virtual ResourceType::Type ResourceTypeForSSLRequest( |
+ const content::GlobalRequestID& id) OVERRIDE; |
+ |
+ virtual const GURL& URLForSSLRequest( |
+ const content::GlobalRequestID& id) OVERRIDE; |
+ |
+ virtual bool RenderViewForSSLRequest(const content::GlobalRequestID& id, |
+ int* render_process_host_id, |
+ int* render_view_host_id) OVERRIDE; |
+ |
+ virtual void CancelSSLRequest(const content::GlobalRequestID& id, |
+ int error, |
+ const net::SSLInfo* ssl_info) OVERRIDE; |
+ |
+ virtual void ContinueSSLRequest(const content::GlobalRequestID& id) OVERRIDE; |
+ |
private: |
FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest, |
TestBlockedRequestsProcessDies); |