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 /remoting | |
| 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 '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 589eb31..182c06e 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(base::TimeDelta::FromMilliseconds(interval_ms_), this, + timer_.Start(FROM_HERE, 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(base::TimeDelta::FromMilliseconds(interval_ms_), this, - &HeartbeatSender::DoSendStanza); + timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(interval_ms_), + this, &HeartbeatSender::DoSendStanza); } } } diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc index d3f0e49..e0cf90a 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(interval, this, &ScreenRecorder::DoCapture); + capture_timer_.Start(FROM_HERE, interval, this, &ScreenRecorder::DoCapture); } void ScreenRecorder::DoCapture() { |