diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
| commit | 9e743cddfd631038fe6f1cdde050e18d61319ec6 (patch) | |
| tree | 7ef974e43b23f570433fe819bcd07966165c517f /chrome/browser/sync | |
| parent | 2e7aff66fe443c29b2fc14a776dca5512b0b4729 (diff) | |
| download | chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.zip chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.gz chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.bz2 | |
Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).
This makes it possible to associate a single NetLog with a URLRequestContext, and then attach observers to that log to watch the stream of events.
This changelist attempts to do the most direct translation, so there will be subsequent iterations to clean up.
The user-visible behavior should remain unchanged.
BUG=37421
Review URL: http://codereview.chromium.org/848006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc index 14f4392..875052b 100644 --- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc +++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc @@ -237,7 +237,7 @@ TransportSocket::TransportSocket(talk_base::AsyncSocket* socket, } int TransportSocket::Connect(net::CompletionCallback* callback, - net::LoadLog* /* load_log */) { + const net::BoundNetLog& /* net_log */) { connect_callback_ = callback; return socket_->Connect(addr_); } diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h index 12dfc74..2e7d618 100644 --- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h +++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h @@ -15,7 +15,7 @@ #include "talk/base/ssladapter.h" namespace net { -class LoadLog; +class BoundNetLog; } // namespace net namespace notifier { @@ -38,7 +38,7 @@ class TransportSocket : public net::ClientSocket, public sigslot::has_slots<> { // net::ClientSocket implementation virtual int Connect(net::CompletionCallback* callback, - net::LoadLog* /* load_log */); + const net::BoundNetLog& /* net_log */); virtual void Disconnect(); virtual bool IsConnected() const; virtual bool IsConnectedAndIdle() const; |