Index: content/browser/renderer_host/media/audio_input_renderer_host.cc |
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
index 37d93ef8ca2f8c4afe849febd24beab6f3e3796b..ba2fe8df78f38e1b4a85b9adbffd73edc993f4a1 100644 |
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc |
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
@@ -14,6 +14,7 @@ |
#include "content/browser/renderer_host/media/web_contents_audio_input_stream.h" |
#include "content/browser/renderer_host/media/web_contents_capture_util.h" |
#include "media/audio/audio_manager_base.h" |
+#include "media/audio/key_press_monitor.h" |
#if defined(USE_CRAS) |
#include "media/audio/cras/audio_manager_cras.h" |
@@ -55,11 +56,12 @@ AudioInputRendererHost::AudioEntry::~AudioEntry() {} |
AudioInputRendererHost::AudioInputRendererHost( |
media::AudioManager* audio_manager, |
MediaStreamManager* media_stream_manager, |
- AudioMirroringManager* audio_mirroring_manager) |
+ AudioMirroringManager* audio_mirroring_manager, |
+ media::KeyPressMonitor* key_press_monitor) |
: audio_manager_(audio_manager), |
media_stream_manager_(media_stream_manager), |
- audio_mirroring_manager_(audio_mirroring_manager) { |
-} |
+ audio_mirroring_manager_(audio_mirroring_manager), |
+ key_press_monitor_(key_press_monitor) {} |
Sergey Ulanov
2013/08/08 01:25:48
move } to the next line.
|
AudioInputRendererHost::~AudioInputRendererHost() { |
DCHECK(audio_entries_.empty()); |
@@ -287,20 +289,23 @@ void AudioInputRendererHost::OnCreateStream( |
entry->controller = media::AudioInputController::CreateForStream( |
audio_manager_->GetMessageLoop(), |
this, |
- WebContentsAudioInputStream::Create( |
- device_id, audio_params, audio_manager_->GetWorkerLoop(), |
- audio_mirroring_manager_), |
- entry->writer.get()); |
+ WebContentsAudioInputStream::Create(device_id, |
+ audio_params, |
+ audio_manager_->GetWorkerLoop(), |
+ audio_mirroring_manager_), |
+ entry->writer.get(), |
+ key_press_monitor_); |
} else { |
// TODO(henrika): replace CreateLowLatency() with Create() as soon |
// as satish has ensured that Speech Input also uses the default low- |
// latency path. See crbug.com/112472 for details. |
- entry->controller = media::AudioInputController::CreateLowLatency( |
- audio_manager_, |
- this, |
- audio_params, |
- device_id, |
- entry->writer.get()); |
+ entry->controller = |
+ media::AudioInputController::CreateLowLatency(audio_manager_, |
+ this, |
+ audio_params, |
+ device_id, |
+ entry->writer.get(), |
+ key_press_monitor_); |
} |
if (!entry->controller.get()) { |