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 /media/audio | |
| 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 'media/audio')
| -rw-r--r-- | media/audio/audio_input_controller.cc | 2 | ||||
| -rw-r--r-- | media/audio/audio_output_dispatcher.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index cedbb24..da957e6 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_(FROM_HERE, + ALLOW_THIS_IN_INITIALIZER_LIST(no_data_timer_( base::TimeDelta::FromSeconds(kTimerResetInterval), this, &AudioInputController::DoReportNoDataError)), diff --git a/media/audio/audio_output_dispatcher.cc b/media/audio/audio_output_dispatcher.cc index ac08bcb..c707069 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_(FROM_HERE, + ALLOW_THIS_IN_INITIALIZER_LIST(close_timer_( base::TimeDelta::FromMilliseconds(close_delay_ms), this, &AudioOutputDispatcher::ClosePendingStreams)) { } |