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

Unified Diff: net/socket/ssl_client_socket.cc

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.cc
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index 10873ae87146d54b492b8f67ab9664e491622d53..d48233aac004ee4af4c973924f99680c10b2467c 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;
}

Powered by Google App Engine
This is Rietveld 408576698