summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_stream.h
diff options
context:
space:
mode:
authorrtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 17:50:51 +0000
committerrtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 17:50:51 +0000
commitc30bcce5bcaac902a63146da6151494b832bac13 (patch)
treef33179c11efe6383ada786fb201fc4a3e5e543e3 /net/spdy/spdy_stream.h
parentebc463107e2892419d560195b8325ba4c3229599 (diff)
downloadchromium_src-c30bcce5bcaac902a63146da6151494b832bac13.zip
chromium_src-c30bcce5bcaac902a63146da6151494b832bac13.tar.gz
chromium_src-c30bcce5bcaac902a63146da6151494b832bac13.tar.bz2
Added protocol_version negotiated with the server.
protocol_version will be printed by the LoadTimes extension. R=willchan BUG=108134 TEST=network unittests Review URL: http://codereview.chromium.org/8914005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_stream.h')
-rw-r--r--net/spdy/spdy_stream.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 865fd23..f022322 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -19,6 +19,7 @@
#include "net/base/net_export.h"
#include "net/base/net_log.h"
#include "net/base/upload_data.h"
+#include "net/socket/ssl_client_socket.h"
#include "net/spdy/spdy_framer.h"
#include "net/spdy/spdy_protocol.h"
@@ -214,7 +215,9 @@ class NET_EXPORT_PRIVATE SpdyStream
spdy::SpdyDataFlags flags);
// Fills SSL info in |ssl_info| and returns true when SSL is in use.
- bool GetSSLInfo(SSLInfo* ssl_info, bool* was_npn_negotiated);
+ bool GetSSLInfo(SSLInfo* ssl_info,
+ bool* was_npn_negotiated,
+ SSLClientSocket::NextProto* protocol_negotiated);
// Fills SSL Certificate Request info |cert_request_info| and returns
// true when SSL is in use.