summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/audio_manager_base.cc5
-rw-r--r--media/audio/audio_manager_base.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index fe7c12e..b633432 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -78,10 +78,11 @@ AudioManagerBase::AudioManagerBase(AudioLogFactory* audio_log_factory)
max_num_input_streams_(kDefaultMaxInputStreams),
num_output_streams_(0),
num_input_streams_(0),
- // TODO(dalecurtis): Switch this to an ObserverListThreadSafe, so we don't
+ // TODO(dalecurtis): Switch this to an base::ObserverListThreadSafe, so we
+ // don't
// block the UI thread when swapping devices.
output_listeners_(
- ObserverList<AudioDeviceListener>::NOTIFY_EXISTING_ONLY),
+ base::ObserverList<AudioDeviceListener>::NOTIFY_EXISTING_ONLY),
audio_thread_("AudioThread"),
audio_log_factory_(audio_log_factory) {
#if defined(OS_WIN)
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 113a0202..0ac7020 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -174,7 +174,7 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
int num_input_streams_;
// Track output state change listeners.
- ObserverList<AudioDeviceListener> output_listeners_;
+ base::ObserverList<AudioDeviceListener> output_listeners_;
// Thread used to interact with audio streams created by this audio manager.
base::Thread audio_thread_;