| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index b73e670a68b418ed140fe417ba51df9a6d314bc3..d1e9ccca8ad508ae695d35d65fd544aff07948e3 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -35,12 +35,14 @@
|
| #include "content/common/media/media_stream_options.h"
|
| #include "content/common/content_export.h"
|
|
|
| -class AudioManager;
|
| -
|
| namespace content {
|
| class ResourceContext;
|
| }
|
|
|
| +namespace media {
|
| +class AudioManager;
|
| +}
|
| +
|
| namespace media_stream {
|
|
|
| class AudioInputDeviceManager;
|
| @@ -61,9 +63,9 @@ class CONTENT_EXPORT MediaStreamManager
|
| // been created yet, it will be constructed with the given AudioManager.
|
| static MediaStreamManager* GetForResourceContext(
|
| content::ResourceContext* resource_context,
|
| - AudioManager* audio_manager);
|
| + media::AudioManager* audio_manager);
|
|
|
| - explicit MediaStreamManager(AudioManager* audio_manager);
|
| + explicit MediaStreamManager(media::AudioManager* audio_manager);
|
| virtual ~MediaStreamManager();
|
|
|
| // Used to access VideoCaptureManager.
|
| @@ -151,7 +153,7 @@ class CONTENT_EXPORT MediaStreamManager
|
| // All non-closed request.
|
| typedef std::map<std::string, DeviceRequest> DeviceRequests;
|
| DeviceRequests requests_;
|
| - AudioManager* audio_manager_;
|
| + media::AudioManager* audio_manager_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
|
| };
|
|
|