summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authortoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 20:04:30 +0000
committertoyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 20:04:30 +0000
commitefacfe3516e3064810fa9c085e9920fbb6e21968 (patch)
treee1a7fbe7460774d36c7a5997cc38c83a52196e14 /net/websockets
parent64e266915ffab2a2cd3757125b9ec51b5a35ffa5 (diff)
downloadchromium_src-efacfe3516e3064810fa9c085e9920fbb6e21968.zip
chromium_src-efacfe3516e3064810fa9c085e9920fbb6e21968.tar.gz
chromium_src-efacfe3516e3064810fa9c085e9920fbb6e21968.tar.bz2
OnSSLCertificateError delegate chain back to SocketStreamDispatcherHost
SSL cert errors must be handled by SSLManager. This change provide delegate chain back to SocketStreamDispatcherHost to handle the error by SSLManager here. BUG=53836 TEST=run existing unit tests because this change is a kind of refactoring Review URL: http://codereview.chromium.org/9454011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job.cc6
-rw-r--r--net/websockets/websocket_job.h4
2 files changed, 10 insertions, 0 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index b6f1b2b..945f631 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -267,6 +267,12 @@ void WebSocketJob::OnAuthRequired(
delegate_->OnAuthRequired(socket, auth_info);
}
+void WebSocketJob::OnSSLCertificateError(
+ SocketStream* socket, const SSLInfo& ssl_info, bool fatal) {
+ if (delegate_)
+ delegate_->OnSSLCertificateError(socket, ssl_info, fatal);
+}
+
void WebSocketJob::OnError(const SocketStream* socket, int error) {
if (delegate_ && error != ERR_PROTOCOL_SWITCHED)
delegate_->OnError(socket, error);
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index 96fa054..0abac3c 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -21,6 +21,7 @@ class GURL;
namespace net {
class DrainableIOBuffer;
+class SSLInfo;
class WebSocketHandshakeRequestHandler;
class WebSocketHandshakeResponseHandler;
@@ -71,6 +72,9 @@ class NET_EXPORT WebSocketJob
virtual void OnClose(SocketStream* socket) OVERRIDE;
virtual void OnAuthRequired(
SocketStream* socket, AuthChallengeInfo* auth_info) OVERRIDE;
+ virtual void OnSSLCertificateError(SocketStream* socket,
+ const SSLInfo& ssl_info,
+ bool fatal) OVERRIDE;
virtual void OnError(const SocketStream* socket, int error) OVERRIDE;
// SpdyWebSocketStream::Delegate methods.