diff options
author | phoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 11:11:35 +0000 |
---|---|---|
committer | phoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 11:11:35 +0000 |
commit | 1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6 (patch) | |
tree | 447a7a4b1091b6b3023da4cd5e34163a7364a5b2 /content/browser/speech | |
parent | 8c2614c507b95b532e3edaba22fdafd67c94234f (diff) | |
download | chromium_src-1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6.zip chromium_src-1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6.tar.gz chromium_src-1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6.tar.bz2 |
Revert 217768 "Adding key press detection in the browser process."
> Adding key press detection in the browser process.
> It works like this on the browser side:
> A new object KeyPressMonitor is created on BrowserMainLoop and passed to AudioInputRendererHost to pass to AudioInputController.
> AudioInputController::DoRecord calls KeyPressMonitor::AddKeyPressListener --> KeyPressMonitor listens to system key events through UserInputMonitor(only implemented on Linux) --> AudioInputController::OnKeyPressed is called and sets key_pressed_ --> When AudioInputController::OnData called, it writes key_pressed_ to shared memory along with the audio data buffer.
> On the renderer side a new param "key_pressed" is added through the code path of passing the flag to the webrtc voice engine.
> This CL includes all these changes except the implementation of UserInputMonitor for Windows and Mac. The impl of UserInputMonitor is mostly copied from remoting/host/local_input_monitor_linux.cc
>
>
> BUG=
>
> Review URL: https://chromiumcodereview.appspot.com/21183002
TBR=jiayl@chromium.org
Review URL: https://codereview.chromium.org/22871007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech')
-rw-r--r-- | content/browser/speech/speech_recognizer_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index 2dae430..2081b2f 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc @@ -564,7 +564,7 @@ SpeechRecognizerImpl::StartRecording(const FSMEventArgs&) { new OnDataConverter(input_parameters, output_parameters)); audio_controller_ = AudioInputController::Create( - audio_manager, this, input_parameters, device_id_, NULL); + audio_manager, this, input_parameters, device_id_); if (!audio_controller_.get()) { return Abort(SpeechRecognitionError(SPEECH_RECOGNITION_ERROR_AUDIO)); |