diff options
| author | perkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 13:22:48 +0000 |
|---|---|---|
| committer | perkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 13:22:48 +0000 |
| commit | 1f2e3c2077babf5d8fb60180e6be3e74531ca382 (patch) | |
| tree | 1e4a32da346df3e541370522880d4fc3416d9797 /content/browser/speech/speech_recognition_manager_impl.cc | |
| parent | 67ac6d300873e31c57c9c3b87d5b5febf28bbed8 (diff) | |
| download | chromium_src-1f2e3c2077babf5d8fb60180e6be3e74531ca382.zip chromium_src-1f2e3c2077babf5d8fb60180e6be3e74531ca382.tar.gz chromium_src-1f2e3c2077babf5d8fb60180e6be3e74531ca382.tar.bz2 | |
This CL move all parsing of constraints used in a call to gUM from MediaStreamImpl to the MediaStreamManager.
The purpose is to be able to support all kinds of constraints when selecting what device to use.
More specifically, this CL make sure that the sourceID constraint can be used as both optional and mandatory constraint.
It move the parsing of what type of stream (device, tab capture or screen capture) that should be created to MediaStreamManager since that is also decided by constraints.
In the end, more advanced constraints should be possible,like selecting the the camera that supports a certain resolution.
BUG=325153,325692
R=hclam@chromium.org, joi@chromium.org, tommi@chromium.org, tsepez@chromium.org
Review URL: https://codereview.chromium.org/102353006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognition_manager_impl.cc')
| -rw-r--r-- | content/browser/speech/speech_recognition_manager_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index 6ecfa70..9602374 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc @@ -197,7 +197,7 @@ void SpeechRecognitionManagerImpl::RecognitionAllowedCallback(int session_id, context.render_process_id, context.render_view_id, context.request_id, - StreamOptions(MEDIA_DEVICE_AUDIO_CAPTURE, MEDIA_NO_SERVICE), + StreamOptions(true, false), GURL(context.context_name), base::Bind( &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback, |