Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: net/socket/ssl_client_socket_openssl.h

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unwrap short lines. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_openssl.h
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index f2739d4a21e37b60d5d456988b7e71ecad303c87..5c0f6b49f1a6155e9a85b8507e81cf6d6a464add 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -63,7 +63,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
const base::StringPiece& context,
unsigned char* out,
unsigned int outlen);
- virtual NextProtoStatus GetNextProto(std::string* proto,
+ virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,
std::string* server_protos);
virtual ServerBoundCertService* GetServerBoundCertService() const;
@@ -171,7 +171,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
STATE_VERIFY_CERT_COMPLETE,
};
State next_handshake_state_;
- NextProtoStatus npn_status_;
+ SSLClientSocket::NextProtoStatus npn_status_;
std::string npn_proto_;
std::string server_protos_;
BoundNetLog net_log_;

Powered by Google App Engine
This is Rietveld 408576698