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

Unified Diff: net/socket/ssl_client_socket_impl.cc

Issue 2373663002: Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Fix compile errors. Created 4 years, 1 month 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
« no previous file with comments | « net/socket/ssl_client_socket_impl.h ('k') | net/spdy/spdy_http_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_impl.cc
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
index bb76bf8c46d6d84f7d5ad7d48eacfe751204d151..c032dff3a9eacc87e28764b05afe9c1b13365476 100644
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -194,8 +194,8 @@ std::unique_ptr<base::Value> NetLogSSLInfoCallback(
dict->SetInteger("cipher_suite", SSLConnectionStatusToCipherSuite(
ssl_info.connection_status));
- dict->SetString("next_proto", SSLClientSocket::NextProtoToString(
- socket->GetNegotiatedProtocol()));
+ dict->SetString("next_proto",
+ NextProtoToString(socket->GetNegotiatedProtocol()));
return std::move(dict);
}
« no previous file with comments | « net/socket/ssl_client_socket_impl.h ('k') | net/spdy/spdy_http_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698