| Index: net/socket/ssl_client_socket.h
|
| ===================================================================
|
| --- net/socket/ssl_client_socket.h (revision 112817)
|
| +++ net/socket/ssl_client_socket.h (working copy)
|
| @@ -121,10 +121,19 @@
|
| // kNextProtoNegotiated: *proto is set to the negotiated protocol.
|
| // kNextProtoNoOverlap: *proto is set to the first protocol in the
|
| // supported list.
|
| - virtual NextProtoStatus GetNextProto(std::string* proto) = 0;
|
| + // *server_protos is set to the server advertised protocols.
|
| + virtual NextProtoStatus GetNextProto(std::string* proto,
|
| + std::string* server_protos) = 0;
|
|
|
| static NextProto NextProtoFromString(const std::string& proto_string);
|
|
|
| + static const char* NextProtoStatusToString(
|
| + const SSLClientSocket::NextProtoStatus status);
|
| +
|
| + // Can be used with the second argument(|server_protos|) of |GetNextProto| to
|
| + // construct a comma separated string of server advertised protocols.
|
| + static std::string ServerProtosToString(const std::string& server_protos);
|
| +
|
| static bool IgnoreCertError(int error, int load_flags);
|
|
|
| virtual bool was_npn_negotiated() const;
|
|
|