diff options
| author | mvanouwerkerk <mvanouwerkerk@chromium.org> | 2014-09-25 04:34:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 11:34:40 +0000 |
| commit | 5affd816675a57698f20260c6af0a894d7d4e9c8 (patch) | |
| tree | 51f269ce47a4876666012d85829951cec13d776a /content/browser | |
| parent | a1d1985ccaae302c911676f41c0b062ee7c32371 (diff) | |
| download | chromium_src-5affd816675a57698f20260c6af0a894d7d4e9c8.zip chromium_src-5affd816675a57698f20260c6af0a894d7d4e9c8.tar.gz chromium_src-5affd816675a57698f20260c6af0a894d7d4e9c8.tar.bz2 | |
Revert of Removed the ScriptedSpeech content side. (patchset #2 id:20001 of https://codereview.chromium.org/598923002/)
Reason for revert:
I'm sorry, the ENABLE_SPEECH_RECOGNITION switch is still used in the Chrome on
Android repo. I don't see (on the short term) another way of handling this than
not removing that switch. I'm going to revert this change.
Original issue's description:
> Removed the ScriptedSpeech content side.
>
> Removal the corresponding changes in blink are applied in the following patch
> https://codereview.chromium.org/599863002/
>
> BUG=402536
>
> Committed: https://crrev.com/6b8dda12a7d842517c5c4ee155cf48951e908a7f
> Cr-Commit-Position: refs/heads/master@{#296655}
TBR=avi@chromium.org,mohan.reddy@samsung.com
NOTREECHECKS=true
NOTRY=true
BUG=402536
Review URL: https://codereview.chromium.org/602083002
Cr-Commit-Position: refs/heads/master@{#296692}
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 96193ca..3aad672 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1232,6 +1232,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( #if defined(OS_ANDROID) switches::kDisableGestureRequirementForMediaPlayback, switches::kDisableWebRTC, + switches::kEnableSpeechRecognition, switches::kMediaDrmEnableNonCompositing, switches::kNetworkCountryIso, switches::kDisableWebAudio, |