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

Side by Side Diff: net/spdy/spdy_http_stream.h

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 unified diff | Download patch
« no previous file with comments | « net/socket/ssl_client_socket_impl.cc ('k') | net/spdy/spdy_http_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SPDY_SPDY_HTTP_STREAM_H_ 5 #ifndef NET_SPDY_SPDY_HTTP_STREAM_H_
6 #define NET_SPDY_SPDY_HTTP_STREAM_H_ 6 #define NET_SPDY_SPDY_HTTP_STREAM_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <list> 10 #include <list>
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 bool buffered_read_callback_pending_; 190 bool buffered_read_callback_pending_;
191 // Has more data been received from the network during the wait for the 191 // Has more data been received from the network during the wait for the
192 // scheduled read callback. 192 // scheduled read callback.
193 bool more_read_data_pending_; 193 bool more_read_data_pending_;
194 194
195 // Is this spdy stream direct to the origin server (or to a proxy). 195 // Is this spdy stream direct to the origin server (or to a proxy).
196 bool direct_; 196 bool direct_;
197 197
198 SSLInfo ssl_info_; 198 SSLInfo ssl_info_;
199 bool was_alpn_negotiated_; 199 bool was_alpn_negotiated_;
200 NextProto negotiated_protocol_;
201 200
202 base::WeakPtrFactory<SpdyHttpStream> weak_factory_; 201 base::WeakPtrFactory<SpdyHttpStream> weak_factory_;
203 202
204 DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream); 203 DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream);
205 }; 204 };
206 205
207 } // namespace net 206 } // namespace net
208 207
209 #endif // NET_SPDY_SPDY_HTTP_STREAM_H_ 208 #endif // NET_SPDY_SPDY_HTTP_STREAM_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_impl.cc ('k') | net/spdy/spdy_http_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698