diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 09:54:36 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 09:54:36 +0000 |
| commit | fc88c1ea534ac8a4f28667ce07401fc7e68bb1fb (patch) | |
| tree | 2d09f8c6ee414b6f0d4bc46dd5bbbfc917edf8ba /content/browser/speech/speech_recognizer.h | |
| parent | 5ff11135bfe657fab30536b393522ba9b9b9a7bf (diff) | |
| download | chromium_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/browser/speech/speech_recognizer.h')
| -rw-r--r-- | content/browser/speech/speech_recognizer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h index 7df44fe..3d4e85c 100644 --- a/content/browser/speech/speech_recognizer.h +++ b/content/browser/speech/speech_recognizer.h @@ -83,7 +83,7 @@ class CONTENT_EXPORT SpeechRecognizer FSMEvent event; int audio_error_code; scoped_refptr<AudioChunk> audio_data; - SpeechRecognitionResult engine_result; + SpeechRecognitionResults engine_results; SpeechRecognitionError engine_error; }; @@ -135,8 +135,8 @@ class CONTENT_EXPORT SpeechRecognizer const uint8* data, uint32 size) OVERRIDE; // SpeechRecognitionEngineDelegate methods. - virtual void OnSpeechRecognitionEngineResult( - const SpeechRecognitionResult& result) OVERRIDE; + virtual void OnSpeechRecognitionEngineResults( + const SpeechRecognitionResults& results) OVERRIDE; virtual void OnSpeechRecognitionEngineError( const SpeechRecognitionError& error) OVERRIDE; |