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

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

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/http/http_response_info.cc ('k') | 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"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Log a histogram to reflect |location|. 50 // Log a histogram to reflect |location|.
51 NET_EXPORT void HistogramBrokenAlternateProtocolLocation( 51 NET_EXPORT void HistogramBrokenAlternateProtocolLocation(
52 BrokenAlternateProtocolLocation location); 52 BrokenAlternateProtocolLocation location);
53 53
54 enum AlternateProtocol { 54 enum AlternateProtocol {
55 DEPRECATED_NPN_SPDY_2 = 0, 55 DEPRECATED_NPN_SPDY_2 = 0,
56 ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION = DEPRECATED_NPN_SPDY_2, 56 ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION = DEPRECATED_NPN_SPDY_2,
57 NPN_SPDY_MINIMUM_VERSION = DEPRECATED_NPN_SPDY_2, 57 NPN_SPDY_MINIMUM_VERSION = DEPRECATED_NPN_SPDY_2,
58 NPN_SPDY_3, 58 NPN_SPDY_3,
59 NPN_SPDY_3_1, 59 NPN_SPDY_3_1,
60 NPN_SPDY_4, // SPDY4 is HTTP/2. 60 NPN_SPDY_4_14, // HTTP/2 draft-14
61 NPN_SPDY_MAXIMUM_VERSION = NPN_SPDY_4, 61 NPN_SPDY_4_15, // HTTP/2 draft-15
62 NPN_SPDY_MAXIMUM_VERSION = NPN_SPDY_4_15,
62 QUIC, 63 QUIC,
63 ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION = QUIC, 64 ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION = QUIC,
64 UNINITIALIZED_ALTERNATE_PROTOCOL, 65 UNINITIALIZED_ALTERNATE_PROTOCOL,
65 }; 66 };
66 67
67 // Simply returns whether |protocol| is between 68 // Simply returns whether |protocol| is between
68 // ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION and 69 // ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION and
69 // ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION (inclusive). 70 // ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION (inclusive).
70 NET_EXPORT bool IsAlternateProtocolValid(AlternateProtocol protocol); 71 NET_EXPORT bool IsAlternateProtocolValid(AlternateProtocol protocol);
71 72
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 virtual const NetworkStats* GetServerNetworkStats( 239 virtual const NetworkStats* GetServerNetworkStats(
239 const HostPortPair& host_port_pair) const = 0; 240 const HostPortPair& host_port_pair) const = 0;
240 241
241 private: 242 private:
242 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties); 243 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
243 }; 244 };
244 245
245 } // namespace net 246 } // namespace net
246 247
247 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 248 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_
OLDNEW
« no previous file with comments | « net/http/http_response_info.cc ('k') | net/http/http_server_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698