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 /remoting | |
| 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 'remoting')
| -rw-r--r-- | remoting/host/heartbeat_sender.cc | 6 | ||||
| -rw-r--r-- | remoting/host/screen_recorder.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc index 182c06e..589eb31 100644 --- a/remoting/host/heartbeat_sender.cc +++ b/remoting/host/heartbeat_sender.cc @@ -77,7 +77,7 @@ void HeartbeatSender::OnSignallingConnected(SignalStrategy* signal_strategy, base::Unretained(this))); DoSendStanza(); - timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(interval_ms_), this, + timer_.Start(base::TimeDelta::FromMilliseconds(interval_ms_), this, &HeartbeatSender::DoSendStanza); } @@ -143,8 +143,8 @@ void HeartbeatSender::SetInterval(int interval) { // Restart the timer with the new interval. if (state_ == STARTED) { timer_.Stop(); - timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(interval_ms_), - this, &HeartbeatSender::DoSendStanza); + timer_.Start(base::TimeDelta::FromMilliseconds(interval_ms_), this, + &HeartbeatSender::DoSendStanza); } } } diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc index e0cf90a..d3f0e49 100644 --- a/remoting/host/screen_recorder.cc +++ b/remoting/host/screen_recorder.cc @@ -181,7 +181,7 @@ void ScreenRecorder::StartCaptureTimer() { base::TimeDelta interval = base::TimeDelta::FromMilliseconds( static_cast<int>(base::Time::kMillisecondsPerSecond / max_rate_)); - capture_timer_.Start(FROM_HERE, interval, this, &ScreenRecorder::DoCapture); + capture_timer_.Start(interval, this, &ScreenRecorder::DoCapture); } void ScreenRecorder::DoCapture() { |