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

Side by Side Diff: content/renderer/speech_recognition_dispatcher.h

Issue 11421103: Update the Speech Api to support array(s) of result items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sigh Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ 5 #ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
6 #define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ 6 #define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "content/public/common/speech_recognition_result.h"
11 #include "content/public/renderer/render_view_observer.h" 12 #include "content/public/renderer/render_view_observer.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionH andle.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionH andle.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognizer.h " 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognizer.h "
15 16
16 namespace content { 17 namespace content {
17 class RenderViewImpl; 18 class RenderViewImpl;
18 struct SpeechRecognitionError; 19 struct SpeechRecognitionError;
19 struct SpeechRecognitionResult; 20 struct SpeechRecognitionResult;
20 21
(...skipping 19 matching lines...) Expand all
40 virtual void abort(const WebKit::WebSpeechRecognitionHandle&, 41 virtual void abort(const WebKit::WebSpeechRecognitionHandle&,
41 WebKit::WebSpeechRecognizerClient*) OVERRIDE; 42 WebKit::WebSpeechRecognizerClient*) OVERRIDE;
42 43
43 void OnRecognitionStarted(int request_id); 44 void OnRecognitionStarted(int request_id);
44 void OnAudioStarted(int request_id); 45 void OnAudioStarted(int request_id);
45 void OnSoundStarted(int request_id); 46 void OnSoundStarted(int request_id);
46 void OnSoundEnded(int request_id); 47 void OnSoundEnded(int request_id);
47 void OnAudioEnded(int request_id); 48 void OnAudioEnded(int request_id);
48 void OnErrorOccurred(int request_id, const SpeechRecognitionError& error); 49 void OnErrorOccurred(int request_id, const SpeechRecognitionError& error);
49 void OnRecognitionEnded(int request_id); 50 void OnRecognitionEnded(int request_id);
50 void OnResultRetrieved(int request_id, const SpeechRecognitionResult& result); 51 void OnResultsRetrieved(int request_id,
52 const SpeechRecognitionResults& result);
51 53
52 int GetOrCreateIDForHandle(const WebKit::WebSpeechRecognitionHandle& handle); 54 int GetOrCreateIDForHandle(const WebKit::WebSpeechRecognitionHandle& handle);
53 bool HandleExists(const WebKit::WebSpeechRecognitionHandle& handle); 55 bool HandleExists(const WebKit::WebSpeechRecognitionHandle& handle);
54 const WebKit::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id); 56 const WebKit::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id);
55 57
56 // The WebKit client class that we use to send events back to the JS world. 58 // The WebKit client class that we use to send events back to the JS world.
57 WebKit::WebSpeechRecognizerClient* recognizer_client_; 59 WebKit::WebSpeechRecognizerClient* recognizer_client_;
58 60
59 typedef std::map<int, WebKit::WebSpeechRecognitionHandle> HandleMap; 61 typedef std::map<int, WebKit::WebSpeechRecognitionHandle> HandleMap;
60 HandleMap handle_map_; 62 HandleMap handle_map_;
61 int next_id_; 63 int next_id_;
62 64
63 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher); 65 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher);
64 }; 66 };
65 67
66 } // namespace content 68 } // namespace content
67 69
68 #endif // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ 70 #endif // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
OLDNEW
« no previous file with comments | « content/renderer/input_tag_speech_dispatcher.cc ('k') | content/renderer/speech_recognition_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698