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

Unified Diff: net/spdy/spdy_http_stream.cc

Issue 2496953002: Revert of Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: 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/spdy/spdy_http_stream.h ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_http_stream.cc
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index f371999a3a9c09ec0cf562280b2e188bc5771803..e571615cc8e0c008fd5c62bae8ebed7722e7487a 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -50,6 +50,7 @@
more_read_data_pending_(false),
direct_(direct),
was_alpn_negotiated_(false),
+ negotiated_protocol_(kProtoUnknown),
weak_factory_(this) {
DCHECK(spdy_session_.get());
}
@@ -449,6 +450,7 @@
stream_->SetDelegate(this);
stream_->GetSSLInfo(&ssl_info_);
was_alpn_negotiated_ = stream_->WasNpnNegotiated();
+ negotiated_protocol_ = stream_->GetNegotiatedProtocol();
}
void SpdyHttpStream::ResetStreamInternal() {
« no previous file with comments | « net/spdy/spdy_http_stream.h ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698