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 fe966d01c8e9732704c1d91fa9b573afa65f5842..b944d2cc547dfea4529e637ad87084a128c2e62a 100644 |
--- a/content/browser/renderer_host/resource_dispatcher_host.h |
+++ b/content/browser/renderer_host/resource_dispatcher_host.h |
@@ -24,6 +24,7 @@ |
#include "base/time.h" |
#include "base/timer.h" |
#include "content/browser/download/download_resource_handler.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" |
@@ -56,7 +57,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(); |
@@ -172,7 +175,7 @@ class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate { |
// for it are dead. |
void CancelRequestsForContext(content::ResourceContext* context); |
- // net::URLRequest::Delegate |
+ // net::URLRequest::Delegate: |
virtual void OnReceivedRedirect(net::URLRequest* request, |
const GURL& new_url, |
bool* defer_redirect) OVERRIDE; |
@@ -279,6 +282,12 @@ class CONTENT_EXPORT ResourceDispatcherHost : public net::URLRequest::Delegate { |
const DownloadSaveInfo& save_info, |
const DownloadResourceHandler::OnStartedCallback& started_cb); |
+ // SSLErrorHandler::Delegate: |
darin (slow to review)
2012/03/09 20:49:03
it seems like it would be better to move these fun
Takashi Toyoshima
2012/03/10 00:24:44
I see.
Also I remove their implementation just bef
|
+ 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); |