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

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

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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/socket/next_proto.h ('k') | net/socket/ssl_client_socket.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "next_proto.h" 5 #include "next_proto.h"
6 6
7 namespace net { 7 namespace net {
8 8
9 NextProtoVector NextProtosHttpOnly() { 9 NextProtoVector NextProtosHttpOnly() {
10 NextProtoVector next_protos; 10 NextProtoVector next_protos;
(...skipping 13 matching lines...) Expand all
24 NextProtoVector next_protos; 24 NextProtoVector next_protos;
25 next_protos.push_back(kProtoHTTP11); 25 next_protos.push_back(kProtoHTTP11);
26 if (quic_enabled) 26 if (quic_enabled)
27 next_protos.push_back(kProtoQUIC1SPDY3); 27 next_protos.push_back(kProtoQUIC1SPDY3);
28 if (spdy_enabled) { 28 if (spdy_enabled) {
29 next_protos.push_back(kProtoSPDY31); 29 next_protos.push_back(kProtoSPDY31);
30 } 30 }
31 return next_protos; 31 return next_protos;
32 } 32 }
33 33
34 NextProtoVector NextProtosSpdy3() {
35 NextProtoVector next_protos;
36 next_protos.push_back(kProtoHTTP11);
37 next_protos.push_back(kProtoQUIC1SPDY3);
38 return next_protos;
39 }
40
41 NextProtoVector NextProtosSpdy31() { 34 NextProtoVector NextProtosSpdy31() {
42 NextProtoVector next_protos; 35 NextProtoVector next_protos;
43 next_protos.push_back(kProtoHTTP11); 36 next_protos.push_back(kProtoHTTP11);
44 next_protos.push_back(kProtoQUIC1SPDY3); 37 next_protos.push_back(kProtoQUIC1SPDY3);
45 next_protos.push_back(kProtoSPDY31); 38 next_protos.push_back(kProtoSPDY31);
46 return next_protos; 39 return next_protos;
47 } 40 }
48 41
49 NextProtoVector NextProtosSpdy31WithSpdy2() {
50 NextProtoVector next_protos;
51 next_protos.push_back(kProtoHTTP11);
52 next_protos.push_back(kProtoQUIC1SPDY3);
53 next_protos.push_back(kProtoDeprecatedSPDY2);
54 next_protos.push_back(kProtoSPDY31);
55 return next_protos;
56 }
57
58 NextProtoVector NextProtosSpdy4Http2() { 42 NextProtoVector NextProtosSpdy4Http2() {
59 NextProtoVector next_protos; 43 NextProtoVector next_protos;
60 next_protos.push_back(kProtoHTTP11); 44 next_protos.push_back(kProtoHTTP11);
61 next_protos.push_back(kProtoQUIC1SPDY3); 45 next_protos.push_back(kProtoQUIC1SPDY3);
62 next_protos.push_back(kProtoSPDY31); 46 next_protos.push_back(kProtoSPDY31);
63 next_protos.push_back(kProtoSPDY4); 47 next_protos.push_back(kProtoSPDY4_14);
48 next_protos.push_back(kProtoSPDY4_15);
64 return next_protos; 49 return next_protos;
65 } 50 }
66 51
67 } // namespace net 52 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/next_proto.h ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698