summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 09:54:36 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 09:54:36 +0000
commitfc88c1ea534ac8a4f28667ce07401fc7e68bb1fb (patch)
tree2d09f8c6ee414b6f0d4bc46dd5bbbfc917edf8ba /content/common
parent5ff11135bfe657fab30536b393522ba9b9b9a7bf (diff)
downloadchromium_src-fc88c1ea534ac8a4f28667ce07401fc7e68bb1fb.zip
chromium_src-fc88c1ea534ac8a4f28667ce07401fc7e68bb1fb.tar.gz
chromium_src-fc88c1ea534ac8a4f28667ce07401fc7e68bb1fb.tar.bz2
Revert 170701 since the WebKit change has now been rolled in again.
> Revert 170668 > Needs to revert this because its WebKit patch was unrolled. > (See r136319, unreviewed, rolling out r136236). > > Update the Speech Api to support array(s) of result items > > instead of a single item at a time. > > > > BUG=143124 > > TEST=Covered by content_unittests > > > > Review URL: https://chromiumcodereview.appspot.com/11421103 > > TBR=tommi@chromium.org > Review URL: https://codereview.chromium.org/11416310 TBR=tasak@google.com Review URL: https://codereview.chromium.org/11316330 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/speech_recognition_messages.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/speech_recognition_messages.h b/content/common/speech_recognition_messages.h
index 593f877..f68a48d 100644
--- a/content/common/speech_recognition_messages.h
+++ b/content/common/speech_recognition_messages.h
@@ -79,9 +79,9 @@ IPC_MESSAGE_CONTROL2(InputTagSpeechHostMsg_StopRecording,
// Browser -> Renderer messages.
// Relays a speech recognition result, either partial or final.
-IPC_MESSAGE_ROUTED2(InputTagSpeechMsg_SetRecognitionResult,
+IPC_MESSAGE_ROUTED2(InputTagSpeechMsg_SetRecognitionResults,
int /* request_id */,
- content::SpeechRecognitionResult /* result */)
+ content::SpeechRecognitionResults /* results */)
// Indicates that speech recognizer has stopped recording and started
// recognition.
@@ -149,7 +149,7 @@ IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_StopCaptureRequest,
// events defined in content/public/browser/speech_recognition_event_listener.h.
IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ResultRetrieved,
int /* request_id */,
- content::SpeechRecognitionResult /* result */)
+ content::SpeechRecognitionResults /* results */)
IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ErrorOccurred,
int /* request_id */,