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

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

Issue 1143773002: Add HTTP/2 RFC link in comment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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 | « no previous file | no next file » | 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 15 matching lines...) Expand all
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 kProtoSPDY4_14 = 103, // HTTP/2 draft-14, designated implementation draft. 31 kProtoSPDY4_14 = 103, // HTTP/2 draft-14, designated implementation draft.
32 kProtoSPDY4MinimumVersion = kProtoSPDY4_14, 32 kProtoSPDY4MinimumVersion = kProtoSPDY4_14,
33 // kProtoSPDY4_15 = 104, // HTTP/2 draft-15 33 // kProtoSPDY4_15 = 104, // HTTP/2 draft-15
34 // kProtoSPDY4_16 = 105, // HTTP/2 draft-16 34 // kProtoSPDY4_16 = 105, // HTTP/2 draft-16
35 // kProtoSPDY4_17 = 106, // HTTP/2 draft-17 35 // kProtoSPDY4_17 = 106, // HTTP/2 draft-17
36 kProtoSPDY4 = 107, // HTTP/2. TODO(bnc): Add RFC number when published. 36 kProtoSPDY4 = 107, // HTTP/2, see https://tools.ietf.org/html/rfc7540.
Ryan Hamilton 2015/05/18 14:30:59 I'm surprised that git cl format didn't line up th
Bence 2015/05/18 14:35:56 Maybe because lines 33--35 are commented out, so t
37 kProtoSPDY4MaximumVersion = kProtoSPDY4, 37 kProtoSPDY4MaximumVersion = kProtoSPDY4,
38 kProtoSPDYMaximumVersion = kProtoSPDY4MaximumVersion, 38 kProtoSPDYMaximumVersion = kProtoSPDY4MaximumVersion,
39 39
40 kProtoQUIC1SPDY3 = 200, 40 kProtoQUIC1SPDY3 = 200,
41 41
42 kProtoMaximumVersion = kProtoQUIC1SPDY3, 42 kProtoMaximumVersion = kProtoQUIC1SPDY3,
43 }; 43 };
44 44
45 // List of protocols to use for NPN, used for configuring HttpNetworkSessions. 45 // List of protocols to use for NPN, used for configuring HttpNetworkSessions.
46 typedef std::vector<NextProto> NextProtoVector; 46 typedef std::vector<NextProto> NextProtoVector;
47 47
48 // Convenience functions to create NextProtoVector. 48 // Convenience functions to create NextProtoVector.
49 49
50 // Default values, which are subject to change over time. 50 // Default values, which are subject to change over time.
51 NET_EXPORT NextProtoVector NextProtosDefaults(); 51 NET_EXPORT NextProtoVector NextProtosDefaults();
52 52
53 // Enable SPDY/3.1 and QUIC, but not HTTP/2. 53 // Enable SPDY/3.1 and QUIC, but not HTTP/2.
54 NET_EXPORT NextProtoVector NextProtosSpdy31(); 54 NET_EXPORT NextProtoVector NextProtosSpdy31();
55 55
56 // Control SPDY/3.1 and HTTP/2 separately. 56 // Control SPDY/3.1 and HTTP/2 separately.
57 NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled, 57 NET_EXPORT NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
58 bool quic_enabled); 58 bool quic_enabled);
59 59
60 // Returns true if |next_proto| is a version of SPDY or HTTP/2. 60 // Returns true if |next_proto| is a version of SPDY or HTTP/2.
61 bool NextProtoIsSPDY(NextProto next_proto); 61 bool NextProtoIsSPDY(NextProto next_proto);
62 62
63 } // namespace net 63 } // namespace net
64 64
65 #endif // NET_SOCKET_NEXT_PROTO_H_ 65 #endif // NET_SOCKET_NEXT_PROTO_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698