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

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

Issue 2348453002: Remove NPN from SSLConfig and SSLClientSocket*. (Closed)
Patch Set: Re: #7. Created 4 years, 3 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 | « net/http/bidirectional_stream.cc ('k') | net/http/http_network_session.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_NETWORK_SESSION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_ 6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 void CloseIdleConnections(); 257 void CloseIdleConnections();
258 258
259 // Returns the original Params used to construct this session. 259 // Returns the original Params used to construct this session.
260 const Params& params() const { return params_; } 260 const Params& params() const { return params_; }
261 261
262 bool IsProtocolEnabled(AlternateProtocol protocol) const; 262 bool IsProtocolEnabled(AlternateProtocol protocol) const;
263 263
264 // Populates |*alpn_protos| with protocols to be used with ALPN. 264 // Populates |*alpn_protos| with protocols to be used with ALPN.
265 void GetAlpnProtos(NextProtoVector* alpn_protos) const; 265 void GetAlpnProtos(NextProtoVector* alpn_protos) const;
266 266
267 // Populates |*npn_protos| with protocols to be used with NPN.
268 void GetNpnProtos(NextProtoVector* npn_protos) const;
269
270 // Populates |server_config| and |proxy_config| based on this session and 267 // Populates |server_config| and |proxy_config| based on this session and
271 // |request|. 268 // |request|.
272 void GetSSLConfig(const HttpRequestInfo& request, 269 void GetSSLConfig(const HttpRequestInfo& request,
273 SSLConfig* server_config, 270 SSLConfig* server_config,
274 SSLConfig* proxy_config) const; 271 SSLConfig* proxy_config) const;
275 272
276 private: 273 private:
277 friend class HttpNetworkSessionPeer; 274 friend class HttpNetworkSessionPeer;
278 275
279 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type); 276 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
(...skipping 25 matching lines...) Expand all
305 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 302 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
306 303
307 Params params_; 304 Params params_;
308 305
309 std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_; 306 std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
310 }; 307 };
311 308
312 } // namespace net 309 } // namespace net
313 310
314 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 311 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « net/http/bidirectional_stream.cc ('k') | net/http/http_network_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698