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

Side by Side Diff: net/spdy/spdy_session.h

Issue 10854063: Clean-up inline members of nested classes (net/) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add a NET_EXPOR_PRIVATE Created 8 years, 4 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 | « net/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_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_SPDY_SPDY_SESSION_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_H_
6 #define NET_SPDY_SPDY_SESSION_H_ 6 #define NET_SPDY_SPDY_SESSION_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy2Test, DeleteExpiredPushStreams); 367 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy2Test, DeleteExpiredPushStreams);
368 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, Ping); 368 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, Ping);
369 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, FailedPing); 369 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, FailedPing);
370 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, GetActivePushStream); 370 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, GetActivePushStream);
371 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, DeleteExpiredPushStreams); 371 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, DeleteExpiredPushStreams);
372 372
373 struct PendingCreateStream { 373 struct PendingCreateStream {
374 PendingCreateStream(const GURL& url, RequestPriority priority, 374 PendingCreateStream(const GURL& url, RequestPriority priority,
375 scoped_refptr<SpdyStream>* spdy_stream, 375 scoped_refptr<SpdyStream>* spdy_stream,
376 const BoundNetLog& stream_net_log, 376 const BoundNetLog& stream_net_log,
377 const CompletionCallback& callback) 377 const CompletionCallback& callback);
378 : url(&url),
379 priority(priority),
380 spdy_stream(spdy_stream),
381 stream_net_log(&stream_net_log),
382 callback(callback) {
383 }
384 378
385 ~PendingCreateStream(); 379 ~PendingCreateStream();
386 380
387 const GURL* url; 381 const GURL* url;
388 RequestPriority priority; 382 RequestPriority priority;
389 scoped_refptr<SpdyStream>* spdy_stream; 383 scoped_refptr<SpdyStream>* spdy_stream;
390 const BoundNetLog* stream_net_log; 384 const BoundNetLog* stream_net_log;
391 CompletionCallback callback; 385 CompletionCallback callback;
392 }; 386 };
393 typedef std::queue<PendingCreateStream, std::list<PendingCreateStream> > 387 typedef std::queue<PendingCreateStream, std::list<PendingCreateStream> >
(...skipping 10 matching lines...) Expand all
404 bool operator() (const SpdyIOBufferProducer* lhs, 398 bool operator() (const SpdyIOBufferProducer* lhs,
405 const SpdyIOBufferProducer* rhs) const { 399 const SpdyIOBufferProducer* rhs) const {
406 return lhs->GetPriority() < rhs->GetPriority(); 400 return lhs->GetPriority() < rhs->GetPriority();
407 } 401 }
408 }; 402 };
409 typedef std::priority_queue<SpdyIOBufferProducer*, 403 typedef std::priority_queue<SpdyIOBufferProducer*,
410 std::vector<SpdyIOBufferProducer*>, 404 std::vector<SpdyIOBufferProducer*>,
411 SpdyIOBufferProducerCompare> WriteQueue; 405 SpdyIOBufferProducerCompare> WriteQueue;
412 406
413 struct CallbackResultPair { 407 struct CallbackResultPair {
414 CallbackResultPair(const CompletionCallback& callback_in, int result_in) 408 CallbackResultPair(const CompletionCallback& callback_in, int result_in);
415 : callback(callback_in), result(result_in) {}
416 ~CallbackResultPair(); 409 ~CallbackResultPair();
417 410
418 CompletionCallback callback; 411 CompletionCallback callback;
419 int result; 412 int result;
420 }; 413 };
421 414
422 typedef std::map<const scoped_refptr<SpdyStream>*, CallbackResultPair> 415 typedef std::map<const scoped_refptr<SpdyStream>*, CallbackResultPair>
423 PendingCallbackMap; 416 PendingCallbackMap;
424 417
425 enum State { 418 enum State {
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 base::TimeDelta hung_interval_; 740 base::TimeDelta hung_interval_;
748 741
749 // This SPDY proxy is allowed to push resources from origins that are 742 // This SPDY proxy is allowed to push resources from origins that are
750 // different from those of their associated streams. 743 // different from those of their associated streams.
751 HostPortPair trusted_spdy_proxy_; 744 HostPortPair trusted_spdy_proxy_;
752 }; 745 };
753 746
754 } // namespace net 747 } // namespace net
755 748
756 #endif // NET_SPDY_SPDY_SESSION_H_ 749 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698