diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 01:38:59 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 01:38:59 +0000 |
| commit | 400d323d53525a13fbfc47efa8a95c4b13cbccb9 (patch) | |
| tree | f647ecce497271c180d9e62d88a4fcfb73328dc9 /jingle | |
| parent | 95d9e253aeb47ef0004edc29c9a8c442106b9488 (diff) | |
| download | chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.zip chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.gz chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.bz2 | |
Currently, base/timer.cc calls PostTask with FROM_HERE as the Location, so the original code that created the delayed callback is lost.
This change adds a tracked_objects::Location parameter to the APIs in base/timer.h so we can trace the PostTask callbacks. The other files are touched to add the FROM_HERE Location parameter.
Review URL: http://codereview.chromium.org/7812036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/pseudotcp_adapter.cc | 3 | ||||
| -rw-r--r-- | jingle/notifier/communicator/login.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc index a34ddd5..e2b3130 100644 --- a/jingle/glue/pseudotcp_adapter.cc +++ b/jingle/glue/pseudotcp_adapter.cc @@ -369,7 +369,8 @@ void PseudoTcpAdapter::Core::AdjustClock() { long timeout = 0; if (pseudo_tcp_.GetNextClock(PseudoTcp::Now(), timeout)) { timer_.Stop(); - timer_.Start(base::TimeDelta::FromMilliseconds(std::max(timeout, 0L)), this, + timer_.Start(FROM_HERE, + base::TimeDelta::FromMilliseconds(std::max(timeout, 0L)), this, &PseudoTcpAdapter::Core::HandleTcpClock); } } diff --git a/jingle/notifier/communicator/login.cc b/jingle/notifier/communicator/login.cc index 42fa0fc..70d3700 100644 --- a/jingle/notifier/communicator/login.cc +++ b/jingle/notifier/communicator/login.cc @@ -117,7 +117,7 @@ void Login::TryReconnect() { VLOG(1) << "Reconnecting in " << reconnect_interval_.InSeconds() << " seconds"; reconnect_timer_.Start( - reconnect_interval_, this, &Login::DoReconnect); + FROM_HERE, reconnect_interval_, this, &Login::DoReconnect); delegate_->OnDisconnect(); } |