Chromium Code Reviews| Index: ppapi/proxy/ppb_tcp_socket_private_proxy.cc |
| diff --git a/ppapi/proxy/ppb_tcp_socket_private_proxy.cc b/ppapi/proxy/ppb_tcp_socket_private_proxy.cc |
| index 26cdfcf5495e0ac7d17979b4aba27ec117f05da7..0ee00bdc58641dcac64165ac307236f2b6a0c916 100644 |
| --- a/ppapi/proxy/ppb_tcp_socket_private_proxy.cc |
| +++ b/ppapi/proxy/ppb_tcp_socket_private_proxy.cc |
| @@ -17,6 +17,9 @@ |
| #include "ppapi/thunk/thunk.h" |
| namespace ppapi { |
| + |
| +class PPB_X509Certificate_Fields; |
|
yzshen1
2012/04/06 19:24:33
I think you should put this in the .h file and mov
raymes
2012/04/06 23:22:47
Done.
|
| + |
| namespace proxy { |
| namespace { |
| @@ -38,8 +41,12 @@ class TCPSocket : public TCPSocketPrivateImpl { |
| virtual void SendConnect(const std::string& host, uint16_t port) OVERRIDE; |
| virtual void SendConnectWithNetAddress( |
| const PP_NetAddress_Private& addr) OVERRIDE; |
| - virtual void SendSSLHandshake(const std::string& server_name, |
| - uint16_t server_port) OVERRIDE; |
| + virtual void SendSSLHandshake( |
| + const std::string& server_name, |
|
yzshen1
2012/04/06 19:24:33
wrong indent.
raymes
2012/04/06 23:22:47
Done.
|
| + uint16_t server_port, |
| + const std::vector<std::vector<char> >& trusted_certs, |
| + const std::vector<std::vector<char> >& untrusted_certs) |
| + OVERRIDE; |
|
yzshen1
2012/04/06 19:24:33
put OVERRIDE on the same line as the last paramete
raymes
2012/04/06 23:22:47
Done.
|
| virtual void SendRead(int32_t bytes_to_read) OVERRIDE; |
| virtual void SendWrite(const std::string& buffer) OVERRIDE; |
| virtual void SendDisconnect() OVERRIDE; |
| @@ -88,10 +95,13 @@ void TCPSocket::SendConnectWithNetAddress(const PP_NetAddress_Private& addr) { |
| API_ID_PPB_TCPSOCKET_PRIVATE, socket_id_, addr)); |
| } |
| -void TCPSocket::SendSSLHandshake(const std::string& server_name, |
| - uint16_t server_port) { |
| +void TCPSocket::SendSSLHandshake( |
| + const std::string& server_name, |
| + uint16_t server_port, |
| + const std::vector<std::vector<char> >& trusted_certs, |
| + const std::vector<std::vector<char> >& untrusted_certs) { |
| SendToBrowser(new PpapiHostMsg_PPBTCPSocket_SSLHandshake( |
| - socket_id_, server_name, server_port)); |
| + socket_id_, server_name, server_port, trusted_certs, untrusted_certs)); |
| } |
| void TCPSocket::SendRead(int32_t bytes_to_read) { |
| @@ -188,7 +198,8 @@ void PPB_TCPSocket_Private_Proxy::OnMsgConnectACK( |
| void PPB_TCPSocket_Private_Proxy::OnMsgSSLHandshakeACK( |
| uint32 /* plugin_dispatcher_id */, |
| uint32 socket_id, |
| - bool succeeded) { |
| + bool succeeded, |
| + const PPB_X509Certificate_Fields& certificate_fields) { |
| if (!g_id_to_socket) { |
| NOTREACHED(); |
| return; |
| @@ -196,7 +207,7 @@ void PPB_TCPSocket_Private_Proxy::OnMsgSSLHandshakeACK( |
| IDToSocketMap::iterator iter = g_id_to_socket->find(socket_id); |
| if (iter == g_id_to_socket->end()) |
| return; |
| - iter->second->OnSSLHandshakeCompleted(succeeded); |
| + iter->second->OnSSLHandshakeCompleted(succeeded, certificate_fields); |
| } |
| void PPB_TCPSocket_Private_Proxy::OnMsgReadACK( |