Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(769)

Unified Diff: content/browser/renderer_host/media/audio_input_renderer_host.cc

Issue 21183002: Adding key press detection in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4a2f731a81c300fc7390832ae60132917dc69659..b2c8d2a5c2ba33fca3f79743a42c6291ee8c2086 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"
namespace content {
@@ -51,11 +52,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) {}
AudioInputRendererHost::~AudioInputRendererHost() {
DCHECK(audio_entries_.empty());
@@ -272,20 +274,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()) {

Powered by Google App Engine
This is Rietveld 408576698