diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 18:23:02 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 18:23:02 +0000 |
| commit | d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff (patch) | |
| tree | 5a6b91bcea70978cbf9b63000ed5f798d532f9b7 /jingle | |
| parent | b1bb86d4d58f736fb980b8611ccf43d79e7b5b2b (diff) | |
| download | chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.zip chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.gz chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.bz2 | |
Update base/timer.h code to pass through Location from call sites. (reland) original CL w/LGTMs: http://codereview.chromium.org/7812036/
Review URL: http://codereview.chromium.org/7824041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99409 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(); } |