diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 18:57:49 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 18:57:49 +0000 |
| commit | 5eb62e9ca850b02c863384aa401ae17ea249a62f (patch) | |
| tree | d972b5a70b233fc53f4157776ec77a4d5cae9f91 /content | |
| parent | 7d4c785b3eb5ccf8626a40dff595c2d0a92993d3 (diff) | |
| download | chromium_src-5eb62e9ca850b02c863384aa401ae17ea249a62f.zip chromium_src-5eb62e9ca850b02c863384aa401ae17ea249a62f.tar.gz chromium_src-5eb62e9ca850b02c863384aa401ae17ea249a62f.tar.bz2 | |
Merge 177134
> Web Speech API: Don't expose the API on Android
>
> The API is not implemented on Android yet.
>
> BUG=170079
> TBR=jamesr
>
> Review URL: https://chromiumcodereview.appspot.com/11970005
TBR=hans@chromium.org
Review URL: https://codereview.chromium.org/12022025
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@177721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 55a1537..51e5f02 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -669,7 +669,12 @@ void RenderThreadImpl::EnsureWebKitInitialized() { WebRuntimeFeatures::enableSpeechInput( !command_line.HasSwitch(switches::kDisableSpeechInput)); +#if defined(OS_ANDROID) + // Web Speech API Speech recognition is not implemented on Android yet. + WebRuntimeFeatures::enableScriptedSpeech(false); +#else WebRuntimeFeatures::enableScriptedSpeech(true); +#endif WebRuntimeFeatures::enableFileSystem( !command_line.HasSwitch(switches::kDisableFileSystem)); |