| Index: content/browser/renderer_host/media/audio_input_renderer_host.h
|
| diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
|
| index e8bec463b84fca1089566b1610badab20fd7abfa..0cfba061b2132b08e8f13ca3d2dcc6b8e4ad6584 100644
|
| --- a/content/browser/renderer_host/media/audio_input_renderer_host.h
|
| +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
|
| @@ -64,15 +64,15 @@
|
| #include "media/audio/audio_io.h"
|
| #include "media/audio/simple_sources.h"
|
|
|
| -namespace content {
|
| -class ResourceContext;
|
| -}
|
| -
|
| namespace media {
|
| class AudioManager;
|
| class AudioParameters;
|
| }
|
|
|
| +namespace media_stream {
|
| +class MediaStreamManager;
|
| +}
|
| +
|
| class CONTENT_EXPORT AudioInputRendererHost
|
| : public content::BrowserMessageFilter,
|
| public media::AudioInputController::EventHandler,
|
| @@ -100,8 +100,9 @@ class CONTENT_EXPORT AudioInputRendererHost
|
| };
|
|
|
| // Called from UI thread from the owner of this object.
|
| - AudioInputRendererHost(content::ResourceContext* resource_context,
|
| - media::AudioManager* audio_manager);
|
| + AudioInputRendererHost(
|
| + media::AudioManager* audio_manager,
|
| + media_stream::MediaStreamManager* media_stream_manager);
|
|
|
| // content::BrowserMessageFilter implementation.
|
| virtual void OnChannelClosing() OVERRIDE;
|
| @@ -197,10 +198,12 @@ class CONTENT_EXPORT AudioInputRendererHost
|
| // Returns 0 if not found.
|
| int LookupSessionById(int stream_id);
|
|
|
| - // Used to get an instance of AudioInputDeviceManager.
|
| - content::ResourceContext* resource_context_;
|
| + // Used to create an AudioInputController.
|
| media::AudioManager* audio_manager_;
|
|
|
| + // Used to access to AudioInputDeviceManager.
|
| + media_stream::MediaStreamManager* media_stream_manager_;
|
| +
|
| // A map of stream IDs to audio sources.
|
| typedef std::map<int, AudioEntry*> AudioEntryMap;
|
| AudioEntryMap audio_entries_;
|
|
|