Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7505)

Unified Diff: chrome/browser/speech/speech_input_manager.cc

Issue 4119004: Add ability to parse multiple recognition results and send them to WebKit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move header to chrome/common and address review comments. Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/speech/speech_input_manager.h ('k') | chrome/browser/speech/speech_recognition_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/speech/speech_input_manager.cc
diff --git a/chrome/browser/speech/speech_input_manager.cc b/chrome/browser/speech/speech_input_manager.cc
index 6d9ffd98ee97c22bcc08978aa32a3d51e49b5847..5447087c05f98a15fb358a518b4f3472c3e41352 100644
--- a/chrome/browser/speech/speech_input_manager.cc
+++ b/chrome/browser/speech/speech_input_manager.cc
@@ -33,8 +33,9 @@ class SpeechInputManagerImpl : public SpeechInputManager,
virtual void StopRecording(int caller_id);
// SpeechRecognizer::Delegate methods.
- virtual void SetRecognitionResult(int caller_id, bool error,
- const string16& value);
+ virtual void SetRecognitionResult(int caller_id,
+ bool error,
+ const SpeechInputResultArray& result);
virtual void DidCompleteRecording(int caller_id);
virtual void DidCompleteRecognition(int caller_id);
virtual void OnRecognizerError(int caller_id,
@@ -149,12 +150,10 @@ void SpeechInputManagerImpl::StopRecording(int caller_id) {
requests_[caller_id].recognizer->StopRecording();
}
-void SpeechInputManagerImpl::SetRecognitionResult(int caller_id,
- bool error,
- const string16& value) {
+void SpeechInputManagerImpl::SetRecognitionResult(
+ int caller_id, bool error, const SpeechInputResultArray& result) {
DCHECK(HasPendingRequest(caller_id));
- GetDelegate(caller_id)->SetRecognitionResult(caller_id,
- (error ? string16() : value));
+ GetDelegate(caller_id)->SetRecognitionResult(caller_id, result);
}
void SpeechInputManagerImpl::DidCompleteRecording(int caller_id) {
« no previous file with comments | « chrome/browser/speech/speech_input_manager.h ('k') | chrome/browser/speech/speech_recognition_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698