diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-16 00:59:10 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-16 00:59:10 +0000 |
| commit | 4429700a526a501f1a8feb597fa23f9e861e9852 (patch) | |
| tree | 734f434874b7f07e85f26b0e85f1f6422b8a6218 /net/spdy/spdy_session.h | |
| parent | d926bf73867d6a7c1ef777b7a555a4992f8bd62c (diff) | |
| download | chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.zip chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.tar.gz chromium_src-4429700a526a501f1a8feb597fa23f9e861e9852.tar.bz2 | |
Reland 47342.
Fixes the merge issue this time. Also fixes a TODO in another change that was blocked on this one.
Support SpdySession as a new NetLog source type. Start logging some more SPDY control frames.
Original code review: http://codereview.chromium.org/2102003/show
BUG=43237
Review URL: http://codereview.chromium.org/2114003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.h')
| -rw-r--r-- | net/spdy/spdy_session.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index 8ef2da0..8ef8759 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -46,7 +46,7 @@ class SpdySession : public base::RefCounted<SpdySession>, // |session| is the HttpNetworkSession. |net_log| is the NetLog that we log // network events to. SpdySession(const HostPortPair& host_port_pair, HttpNetworkSession* session, - const BoundNetLog& net_log); + NetLog* net_log); const HostPortPair& host_port_pair() const { return host_port_pair_; } |