diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 21:52:57 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 21:52:57 +0000 |
| commit | c8647278668f33fc76900483ecf01ea9f34abde9 (patch) | |
| tree | a97e798f531c11d39602ec2d539b37cfdd95539b /webkit | |
| parent | 8822f38cd5d5006033003e5197a56bed2cc33fea (diff) | |
| download | chromium_src-c8647278668f33fc76900483ecf01ea9f34abde9.zip chromium_src-c8647278668f33fc76900483ecf01ea9f34abde9.tar.gz chromium_src-c8647278668f33fc76900483ecf01ea9f34abde9.tar.bz2 | |
Add --enable-speech-input switch and set ENABLE_INPUT_SPEECH=1
Flip the compile-time enable switch for speech input to on and add a
command-line switch to put the functionality behind. The command-line
flag will be used both on the Chromium side and in WebKit via
WebRuntimeFeatures.
This CL depends on the webkit patch https://bugs.webkit.org/show_bug.cgi?id=43146
BUG=none
TEST=browser_tests --gtest_filter=SpeechInputEnableSwitchTest.*
Originally Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=54235, but reverted due to tests failure.
Review URL: http://codereview.chromium.org/3064017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.cc | 1 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 08c1432..ca49b66 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -705,6 +705,9 @@ base::StringPiece GetDataResource(int resource_id) { case IDR_MEDIA_SOUND_DISABLED: case IDR_MEDIA_SLIDER_THUMB: case IDR_MEDIA_VOLUME_SLIDER_THUMB: + case IDR_INPUT_SPEECH: + case IDR_INPUT_SPEECH_RECORDING: + case IDR_INPUT_SPEECH_WAITING: return TestShell::NetResourceProvider(resource_id); default: diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc index ad3ea32..aba2c8b 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.cc +++ b/webkit/tools/test_shell/test_shell_webkit_init.cc @@ -42,6 +42,7 @@ TestShellWebKitInit::TestShellWebKitInit(bool layout_test_mode) { WebKit::WebRuntimeFeatures::enableNotifications(true); WebKit::WebRuntimeFeatures::enableTouch(true); WebKit::WebRuntimeFeatures::enableIndexedDatabase(true); + WebKit::WebRuntimeFeatures::enableSpeechInput(true); // TODO(hwennborg): Enable this once the implementation supports it. WebKit::WebRuntimeFeatures::enableDeviceOrientation(false); diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 845f04c..24cb6be 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -792,6 +792,9 @@ base::StringPiece GetDataResource(int resource_id) { case IDR_DEVTOOLS_INJECT_WEBKIT_JS: case IDR_DEVTOOLS_INJECT_DISPATCH_JS: case IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS: + case IDR_INPUT_SPEECH: + case IDR_INPUT_SPEECH_RECORDING: + case IDR_INPUT_SPEECH_WAITING: return NetResourceProvider(resource_id); default: |