Chromium Code Reviews| Index: media/audio/audio_manager_base.h |
| diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h |
| index 61f95834145048c408f5a5ceaef72078dcd95919..b4ef70edfd5b86131ba68cb40fa2220351f3cd3e 100644 |
| --- a/media/audio/audio_manager_base.h |
| +++ b/media/audio/audio_manager_base.h |
| @@ -12,15 +12,14 @@ |
| #include "base/compiler_specific.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "base/synchronization/lock.h" |
| +#include "base/threading/thread.h" |
|
henrika (OOO until Aug 14)
2012/09/17 16:44:08
Will fix.
|
| +#include "base/win/scoped_com_initializer.h" |
| #include "media/audio/audio_manager.h" |
| -namespace base { |
| -class Thread; |
| -} |
| - |
| namespace media { |
| class AudioOutputDispatcher; |
| +class AudioThread; |
| // AudioManagerBase provides AudioManager functions common for all platforms. |
| class MEDIA_EXPORT AudioManagerBase : public AudioManager { |
| @@ -108,7 +107,7 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { |
| // Thread used to interact with AudioOutputStreams created by this |
| // audio manger. |
| - scoped_ptr<base::Thread> audio_thread_; |
| + scoped_ptr<media::AudioThread> audio_thread_; |
| mutable base::Lock audio_thread_lock_; |
| // Map of cached AudioOutputDispatcher instances. Must only be touched |