diff options
author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
---|---|---|
committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
commit | 8e3c78cb4857505329f602e6af71a46d05346e99 (patch) | |
tree | 0f42439dbfdea47be8189bc39d682062d071d3ec /net/socket/ssl_client_socket.cc | |
parent | 9822df966d60c67faaf4c4adacc70801aed9edaf (diff) | |
download | chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.zip chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.gz chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.bz2 |
Move NextProto enum to a new file net/socket/next_proto.h
BUG=120890
Review URL: http://codereview.chromium.org/9959033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket.cc')
-rw-r--r-- | net/socket/ssl_client_socket.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index 10873ae..d48233a 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -15,7 +15,7 @@ SSLClientSocket::SSLClientSocket() domain_bound_cert_type_(CLIENT_CERT_INVALID_TYPE) { } -SSLClientSocket::NextProto SSLClientSocket::NextProtoFromString( +NextProto SSLClientSocket::NextProtoFromString( const std::string& proto_string) { if (proto_string == "http1.1" || proto_string == "http/1.1") { return kProtoHTTP11; @@ -32,8 +32,7 @@ SSLClientSocket::NextProto SSLClientSocket::NextProtoFromString( } } -const char* SSLClientSocket::NextProtoToString( - SSLClientSocket::NextProto next_proto) { +const char* SSLClientSocket::NextProtoToString(NextProto next_proto) { switch (next_proto) { case kProtoHTTP11: return "http/1.1"; @@ -115,12 +114,11 @@ bool SSLClientSocket::set_was_spdy_negotiated(bool negotiated) { return was_spdy_negotiated_ = negotiated; } -SSLClientSocket::NextProto SSLClientSocket::protocol_negotiated() const { +NextProto SSLClientSocket::protocol_negotiated() const { return protocol_negotiated_; } -void SSLClientSocket::set_protocol_negotiated( - SSLClientSocket::NextProto protocol_negotiated) { +void SSLClientSocket::set_protocol_negotiated(NextProto protocol_negotiated) { protocol_negotiated_ = protocol_negotiated; } |