summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 18:23:02 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 18:23:02 +0000
commitd323a176fa8c2ef474ce41dd8a1cddacb4fc67ff (patch)
tree5a6b91bcea70978cbf9b63000ed5f798d532f9b7 /media/audio
parentb1bb86d4d58f736fb980b8611ccf43d79e7b5b2b (diff)
downloadchromium_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 'media/audio')
-rw-r--r--media/audio/audio_input_controller.cc2
-rw-r--r--media/audio/audio_output_dispatcher.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index da957e6..cedbb24 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -21,7 +21,7 @@ AudioInputController::AudioInputController(EventHandler* handler,
SyncWriter* sync_writer)
: handler_(handler),
stream_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(no_data_timer_(
+ ALLOW_THIS_IN_INITIALIZER_LIST(no_data_timer_(FROM_HERE,
base::TimeDelta::FromSeconds(kTimerResetInterval),
this,
&AudioInputController::DoReportNoDataError)),
diff --git a/media/audio/audio_output_dispatcher.cc b/media/audio/audio_output_dispatcher.cc
index c707069..ac08bcb 100644
--- a/media/audio/audio_output_dispatcher.cc
+++ b/media/audio/audio_output_dispatcher.cc
@@ -18,7 +18,7 @@ AudioOutputDispatcher::AudioOutputDispatcher(
pause_delay_milliseconds_(2 * params.samples_per_packet *
base::Time::kMillisecondsPerSecond / params.sample_rate),
paused_proxies_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(close_timer_(
+ ALLOW_THIS_IN_INITIALIZER_LIST(close_timer_(FROM_HERE,
base::TimeDelta::FromMilliseconds(close_delay_ms),
this, &AudioOutputDispatcher::ClosePendingStreams)) {
}