Commit 5affd816 authored by mvanouwerkerk's avatar mvanouwerkerk Committed by Commit bot

Revert of Removed the ScriptedSpeech content side. (patchset #2 id:20001 of...

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}
parent a1d1985c
...@@ -1232,6 +1232,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( ...@@ -1232,6 +1232,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
switches::kDisableGestureRequirementForMediaPlayback, switches::kDisableGestureRequirementForMediaPlayback,
switches::kDisableWebRTC, switches::kDisableWebRTC,
switches::kEnableSpeechRecognition,
switches::kMediaDrmEnableNonCompositing, switches::kMediaDrmEnableNonCompositing,
switches::kNetworkCountryIso, switches::kNetworkCountryIso,
switches::kDisableWebAudio, switches::kDisableWebAudio,
......
...@@ -111,6 +111,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( ...@@ -111,6 +111,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
if (command_line.HasSwitch(switches::kDisableWebRTC)) if (command_line.HasSwitch(switches::kDisableWebRTC))
WebRuntimeFeatures::enablePeerConnection(false); WebRuntimeFeatures::enablePeerConnection(false);
if (!command_line.HasSwitch(switches::kEnableSpeechRecognition))
WebRuntimeFeatures::enableScriptedSpeech(false);
// WebAudio is enabled by default on ARM and X86, if the MediaCodec // WebAudio is enabled by default on ARM and X86, if the MediaCodec
// API is available. // API is available.
WebRuntimeFeatures::enableWebAudio( WebRuntimeFeatures::enableWebAudio(
......
...@@ -61,6 +61,9 @@ public abstract class ContentSwitches { ...@@ -61,6 +61,9 @@ public abstract class ContentSwitches {
// Native switch - chrome_switches::kEnableInstantExtendedAPI // Native switch - chrome_switches::kEnableInstantExtendedAPI
public static final String ENABLE_INSTANT_EXTENDED_API = "enable-instant-extended-api"; public static final String ENABLE_INSTANT_EXTENDED_API = "enable-instant-extended-api";
// Native switch - content_switches::kEnableSpeechRecognition
public static final String ENABLE_SPEECH_RECOGNITION = "enable-speech-recognition";
// Native switch - shell_switches::kDumpRenderTree // Native switch - shell_switches::kDumpRenderTree
public static final String DUMP_RENDER_TREE = "dump-render-tree"; public static final String DUMP_RENDER_TREE = "dump-render-tree";
......
...@@ -885,6 +885,9 @@ const char kDisableOverscrollEdgeEffect[] = "disable-overscroll-edge-effect"; ...@@ -885,6 +885,9 @@ const char kDisableOverscrollEdgeEffect[] = "disable-overscroll-edge-effect";
// WebRTC is enabled by default on Android. // WebRTC is enabled by default on Android.
const char kDisableWebRTC[] = "disable-webrtc"; const char kDisableWebRTC[] = "disable-webrtc";
// Enable the recognition part of the Web Speech API.
const char kEnableSpeechRecognition[] = "enable-speech-recognition";
// Always use the video overlay for the embedded video. // Always use the video overlay for the embedded video.
// This switch is intended only for tests. // This switch is intended only for tests.
const char kForceUseOverlayEmbeddedVideo[] = "force-use-overlay-embedded-video"; const char kForceUseOverlayEmbeddedVideo[] = "force-use-overlay-embedded-video";
......
...@@ -251,6 +251,7 @@ CONTENT_EXPORT extern const char kDisableGestureRequirementForMediaPlayback[]; ...@@ -251,6 +251,7 @@ CONTENT_EXPORT extern const char kDisableGestureRequirementForMediaPlayback[];
CONTENT_EXPORT extern const char kDisableClickDelay[]; CONTENT_EXPORT extern const char kDisableClickDelay[];
CONTENT_EXPORT extern const char kDisableOverscrollEdgeEffect[]; CONTENT_EXPORT extern const char kDisableOverscrollEdgeEffect[];
CONTENT_EXPORT extern const char kDisableWebRTC[]; CONTENT_EXPORT extern const char kDisableWebRTC[];
CONTENT_EXPORT extern const char kEnableSpeechRecognition[];
CONTENT_EXPORT extern const char kForceUseOverlayEmbeddedVideo[]; CONTENT_EXPORT extern const char kForceUseOverlayEmbeddedVideo[];
CONTENT_EXPORT extern const char kHideScrollbars[]; CONTENT_EXPORT extern const char kHideScrollbars[];
extern const char kNetworkCountryIso[]; extern const char kNetworkCountryIso[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment