diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 19:44:24 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 19:44:24 +0000 |
| commit | 68437a62a1ed8210bf95767bab9dc713536450e5 (patch) | |
| tree | 35bc32fabc760ef7ff9548bda79865648b40c7e7 /webkit/tools/test_shell/layout_test_controller.cc | |
| parent | 89a6ff5f24124c289c90669ce8dc8ed41519202c (diff) | |
| download | chromium_src-68437a62a1ed8210bf95767bab9dc713536450e5.zip chromium_src-68437a62a1ed8210bf95767bab9dc713536450e5.tar.gz chromium_src-68437a62a1ed8210bf95767bab9dc713536450e5.tar.bz2 | |
Revert 64466 - Language tag for speech.
This is the 3rd in a 4-sided patch to add language attribute support to speech input.
The other patches can be found here:
1st - http://codereview.chromium.org/3615005/show
2nd - https://bugs.webkit.org/show_bug.cgi?id=47089
4th - https://bugs.webkit.org/show_bug.cgi?id=47420
This patch will be submitted once the webkit change has been rolled into chromium DEPS. Also, a last webkit cleanup patch will be submitted at any point after the 2nd patch.
BUG=53598
TEST=
Review URL: http://codereview.chromium.org/3595018
TBR=leandrogracia@chromium.org
Review URL: http://codereview.chromium.org/4163005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index d1d13bc..ef206e3 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -1128,10 +1128,9 @@ void LayoutTestController::setAllowFileAccessFromFileURLs( void LayoutTestController::setMockSpeechInputResult(const CppArgumentList& args, CppVariant* result) { - if (args.size() > 0 && args[0].isString() && args[1].isString()) { + if (args.size() > 0 && args[0].isString()) { shell_->speech_input_controller_mock()->setMockRecognitionResult( - WebString::fromUTF8(args[0].ToString()), - WebString::fromUTF8(args[1].ToString())); + WebString::fromUTF8(args[0].ToString())); } result->SetNull(); } |