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

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

Issue 10006047: Persist the alternate protocol as a string not an int to allow the enum to be changed without affec… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor cleanup Created 8 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
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_21, 21 NPN_SPDY_21,
22 NPN_SPDY_3, 22 NPN_SPDY_3,
23 NUM_ALTERNATE_PROTOCOLS, 23 NUM_ALTERNATE_PROTOCOLS,
24 ALTERNATE_PROTOCOL_BROKEN, // The alternate protocol is known to be broken. 24 ALTERNATE_PROTOCOL_BROKEN, // The alternate protocol is known to be broken.
25 UNINITIALIZED_ALTERNATE_PROTOCOL, 25 UNINITIALIZED_ALTERNATE_PROTOCOL,
26 }; 26 };
27 27
28 const char* AlternateProtocolToString(AlternateProtocol protocol);
29 AlternateProtocol AlternateProtocolFromString(const std::string& protocol);
30
28 struct NET_EXPORT PortAlternateProtocolPair { 31 struct NET_EXPORT PortAlternateProtocolPair {
29 bool Equals(const PortAlternateProtocolPair& other) const { 32 bool Equals(const PortAlternateProtocolPair& other) const {
30 return port == other.port && protocol == other.protocol; 33 return port == other.port && protocol == other.protocol;
31 } 34 }
32 35
33 std::string ToString() const; 36 std::string ToString() const;
34 37
35 uint16 port; 38 uint16 port;
36 AlternateProtocol protocol; 39 AlternateProtocol protocol;
37 }; 40 };
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 116
114 virtual PipelineCapabilityMap GetPipelineCapabilityMap() const = 0; 117 virtual PipelineCapabilityMap GetPipelineCapabilityMap() const = 0;
115 118
116 private: 119 private:
117 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties); 120 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
118 }; 121 };
119 122
120 } // namespace net 123 } // namespace net
121 124
122 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 125 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698