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

Side by Side Diff: net/http/http_server_properties.h

Issue 13190010: Switch the QUIC alternate protocol string from "quic/1" to "quic", since QUIC can do its own versio… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/http/http_server_properties.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_HTTP_HTTP_SERVER_PROPERTIES_H_ 5 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_
6 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 6 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "net/base/host_port_pair.h" 11 #include "net/base/host_port_pair.h"
12 #include "net/base/net_export.h" 12 #include "net/base/net_export.h"
13 #include "net/http/http_pipelined_host_capability.h" 13 #include "net/http/http_pipelined_host_capability.h"
14 #include "net/spdy/spdy_framer.h" // TODO(willchan): Reconsider this. 14 #include "net/spdy/spdy_framer.h" // TODO(willchan): Reconsider this.
15 15
16 namespace net { 16 namespace net {
17 17
18 enum AlternateProtocol { 18 enum AlternateProtocol {
19 NPN_SPDY_1 = 0, 19 NPN_SPDY_1 = 0,
20 NPN_SPDY_2, 20 NPN_SPDY_2,
21 NPN_SPDY_3, 21 NPN_SPDY_3,
22 NPN_SPDY_3_1, 22 NPN_SPDY_3_1,
23 QUIC_1, 23 QUIC,
24 NUM_ALTERNATE_PROTOCOLS, 24 NUM_ALTERNATE_PROTOCOLS,
25 ALTERNATE_PROTOCOL_BROKEN, // The alternate protocol is known to be broken. 25 ALTERNATE_PROTOCOL_BROKEN, // The alternate protocol is known to be broken.
26 UNINITIALIZED_ALTERNATE_PROTOCOL, 26 UNINITIALIZED_ALTERNATE_PROTOCOL,
27 }; 27 };
28 28
29 NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol); 29 NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol);
30 NET_EXPORT AlternateProtocol AlternateProtocolFromString( 30 NET_EXPORT AlternateProtocol AlternateProtocolFromString(
31 const std::string& protocol); 31 const std::string& protocol);
32 32
33 struct NET_EXPORT PortAlternateProtocolPair { 33 struct NET_EXPORT PortAlternateProtocolPair {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 virtual PipelineCapabilityMap GetPipelineCapabilityMap() const = 0; 119 virtual PipelineCapabilityMap GetPipelineCapabilityMap() const = 0;
120 120
121 private: 121 private:
122 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties); 122 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
123 }; 123 };
124 124
125 } // namespace net 125 } // namespace net
126 126
127 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 127 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_server_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698