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

Side by Side Diff: net/socket/next_proto.h

Issue 724523002: Support HTTP/2 drafts 14 and 15 simultaneously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename CONNECTION_INFO_SPDY4 to CONNECTION_INFO_HTTP2. Created 6 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/http/http_stream_factory_impl_unittest.cc ('k') | net/socket/next_proto.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_SOCKET_NEXT_PROTO_H_ 5 #ifndef NET_SOCKET_NEXT_PROTO_H_
6 #define NET_SOCKET_NEXT_PROTO_H_ 6 #define NET_SOCKET_NEXT_PROTO_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "net/base/net_export.h" 10 #include "net/base/net_export.h"
(...skipping 10 matching lines...) Expand all
21 enum NextProto { 21 enum NextProto {
22 kProtoUnknown = 0, 22 kProtoUnknown = 0,
23 kProtoHTTP11 = 1, 23 kProtoHTTP11 = 1,
24 kProtoMinimumVersion = kProtoHTTP11, 24 kProtoMinimumVersion = kProtoHTTP11,
25 25
26 kProtoDeprecatedSPDY2 = 100, 26 kProtoDeprecatedSPDY2 = 100,
27 kProtoSPDYMinimumVersion = kProtoDeprecatedSPDY2, 27 kProtoSPDYMinimumVersion = kProtoDeprecatedSPDY2,
28 kProtoSPDYHistogramOffset = kProtoDeprecatedSPDY2, 28 kProtoSPDYHistogramOffset = kProtoDeprecatedSPDY2,
29 kProtoSPDY3 = 101, 29 kProtoSPDY3 = 101,
30 kProtoSPDY31 = 102, 30 kProtoSPDY31 = 102,
31 // HTTP/2 draft-14 was 103, 31 kProtoSPDY4_14 = 103, // HTTP/2 draft-14
32 kProtoSPDY4 = 104, // SPDY4 is HTTP/2 draft-15. 32 kProtoSPDY4MinimumVersion = kProtoSPDY4_14,
33 kProtoSPDYMaximumVersion = kProtoSPDY4, 33 kProtoSPDY4_15 = 104, // HTTP/2 draft-15
34 kProtoSPDY4MaximumVersion = kProtoSPDY4_15,
35 kProtoSPDYMaximumVersion = kProtoSPDY4MaximumVersion,
34 36
35 kProtoQUIC1SPDY3 = 200, 37 kProtoQUIC1SPDY3 = 200,
36 38
37 kProtoMaximumVersion = kProtoQUIC1SPDY3, 39 kProtoMaximumVersion = kProtoQUIC1SPDY3,
38 }; 40 };
39 41
40 // List of protocols to use for NPN, used for configuring HttpNetworkSessions. 42 // List of protocols to use for NPN, used for configuring HttpNetworkSessions.
41 typedef std::vector<NextProto> NextProtoVector; 43 typedef std::vector<NextProto> NextProtoVector;
42 44
43 // Convenience functions to create NextProtoVector. 45 // Convenience functions to create NextProtoVector.
44 46
45 NET_EXPORT NextProtoVector NextProtosHttpOnly(); 47 NET_EXPORT NextProtoVector NextProtosHttpOnly();
46 48
47 // Default values, which are subject to change over time. Currently just 49 // Default values, which are subject to change over time. Currently just
48 // SPDY 3 and 3.1. 50 // SPDY 3 and 3.1.
49 NET_EXPORT NextProtoVector NextProtosDefaults(); 51 NET_EXPORT NextProtoVector NextProtosDefaults();
50 52
51 NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled, 53 NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
52 bool quic_enabled); 54 bool quic_enabled);
53 55
54 // All of these also enable QUIC. 56 // All of these also enable QUIC.
55 NET_EXPORT NextProtoVector NextProtosSpdy31(); 57 NET_EXPORT NextProtoVector NextProtosSpdy31();
56 NET_EXPORT NextProtoVector NextProtosSpdy4Http2(); 58 NET_EXPORT NextProtoVector NextProtosSpdy4Http2();
57 59
58 } // namespace net 60 } // namespace net
59 61
60 #endif // NET_SOCKET_NEXT_PROTO_H_ 62 #endif // NET_SOCKET_NEXT_PROTO_H_
OLDNEW
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/socket/next_proto.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698