diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:28:56 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:28:56 +0000 |
| commit | 6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch) | |
| tree | 6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /jingle | |
| parent | dd8d12a86e01b35b76f4add67cf5e222a475662b (diff) | |
| download | chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.zip chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.gz chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.bz2 | |
Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location,
so the original code that created the delayed callback is lost."
This reverts commit 4cf5cf73d319b69c32ad30af8954235755856455. (r99284)
TBR=jbates@chromium.org
Review URL: http://codereview.chromium.org/7825026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99290 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, 2 insertions, 3 deletions
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc index e2b3130..a34ddd5 100644 --- a/jingle/glue/pseudotcp_adapter.cc +++ b/jingle/glue/pseudotcp_adapter.cc @@ -369,8 +369,7 @@ void PseudoTcpAdapter::Core::AdjustClock() { long timeout = 0; if (pseudo_tcp_.GetNextClock(PseudoTcp::Now(), timeout)) { timer_.Stop(); - timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(std::max(timeout, 0L)), this, + timer_.Start(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 70d3700..42fa0fc 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( - FROM_HERE, reconnect_interval_, this, &Login::DoReconnect); + reconnect_interval_, this, &Login::DoReconnect); delegate_->OnDisconnect(); } |