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

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

Issue 794563003: Change next_proto member type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix type in callback. Created 6 years 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
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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 base::Value* QuicInfoToValue() const; 198 base::Value* QuicInfoToValue() const;
199 199
200 void CloseAllConnections(); 200 void CloseAllConnections();
201 void CloseIdleConnections(); 201 void CloseIdleConnections();
202 202
203 // Returns the original Params used to construct this session. 203 // Returns the original Params used to construct this session.
204 const Params& params() const { return params_; } 204 const Params& params() const { return params_; }
205 205
206 bool IsProtocolEnabled(AlternateProtocol protocol) const; 206 bool IsProtocolEnabled(AlternateProtocol protocol) const;
207 207
208 void GetNextProtos(std::vector<std::string>* next_protos) const; 208 void GetNextProtos(NextProtoVector* next_protos) const;
Ryan Hamilton 2014/12/10 20:09:00 nit: Can you add a comment which explains that thi
Bence 2014/12/10 22:01:23 Done.
209 209
210 // Convenience function for searching through |params_| for 210 // Convenience function for searching through |params_| for
211 // |forced_spdy_exclusions|. 211 // |forced_spdy_exclusions|.
212 bool HasSpdyExclusion(HostPortPair host_port_pair) const; 212 bool HasSpdyExclusion(HostPortPair host_port_pair) const;
213 213
214 private: 214 private:
215 friend class base::RefCounted<HttpNetworkSession>; 215 friend class base::RefCounted<HttpNetworkSession>;
216 friend class HttpNetworkSessionPeer; 216 friend class HttpNetworkSessionPeer;
217 217
218 ~HttpNetworkSession(); 218 ~HttpNetworkSession();
(...skipping 16 matching lines...) Expand all
235 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_; 235 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_;
236 QuicStreamFactory quic_stream_factory_; 236 QuicStreamFactory quic_stream_factory_;
237 SpdySessionPool spdy_session_pool_; 237 SpdySessionPool spdy_session_pool_;
238 scoped_ptr<HttpStreamFactory> http_stream_factory_; 238 scoped_ptr<HttpStreamFactory> http_stream_factory_;
239 scoped_ptr<HttpStreamFactory> http_stream_factory_for_websocket_; 239 scoped_ptr<HttpStreamFactory> http_stream_factory_for_websocket_;
240 std::set<HttpResponseBodyDrainer*> response_drainers_; 240 std::set<HttpResponseBodyDrainer*> response_drainers_;
241 241
242 // TODO(jgraettinger): Remove when Huffman collection is complete. 242 // TODO(jgraettinger): Remove when Huffman collection is complete.
243 scoped_ptr<HpackHuffmanAggregator> huffman_aggregator_; 243 scoped_ptr<HpackHuffmanAggregator> huffman_aggregator_;
244 244
245 std::vector<std::string> next_protos_; 245 NextProtoVector next_protos_;
246 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 246 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
247 247
248 Params params_; 248 Params params_;
249 }; 249 };
250 250
251 } // namespace net 251 } // namespace net
252 252
253 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 253 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698