| Index: content/renderer/speech_recognition_dispatcher.h
|
| diff --git a/content/renderer/speech_input_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h
|
| similarity index 70%
|
| rename from content/renderer/speech_input_dispatcher.h
|
| rename to content/renderer/speech_recognition_dispatcher.h
|
| index 174dd6a1e4c1625f90610f5bc4f7516634eed0f9..a6f4d52df451b444fc5e76d2130a38534eb8957d 100644
|
| --- a/content/renderer/speech_input_dispatcher.h
|
| +++ b/content/renderer/speech_recognition_dispatcher.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_SPEECH_INPUT_DISPATCHER_H_
|
| -#define CONTENT_RENDERER_SPEECH_INPUT_DISPATCHER_H_
|
| +#ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
|
| +#define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| @@ -19,12 +19,12 @@ namespace WebKit {
|
| class WebSpeechInputListener;
|
| }
|
|
|
| -// SpeechInputDispatcher is a delegate for speech input messages used by WebKit.
|
| -// It's the complement of SpeechInputDispatcherHost (owned by RenderViewHost).
|
| -class SpeechInputDispatcher : public content::RenderViewObserver,
|
| +// SpeechRecognitionDispatcher is a delegate for messages used by WebKit. It's
|
| +// the complement of SpeechRecognitionDispatcherHost (owned by RenderViewHost).
|
| +class SpeechRecognitionDispatcher : public content::RenderViewObserver,
|
| public WebKit::WebSpeechInputController {
|
| public:
|
| - SpeechInputDispatcher(RenderViewImpl* render_view,
|
| + SpeechRecognitionDispatcher(RenderViewImpl* render_view,
|
| WebKit::WebSpeechInputListener* listener);
|
|
|
| private:
|
| @@ -41,15 +41,15 @@ class SpeechInputDispatcher : public content::RenderViewObserver,
|
| virtual void cancelRecognition(int request_id);
|
| virtual void stopRecording(int request_id);
|
|
|
| - void OnSpeechRecognitionResult(int request_id,
|
| + void OnResultRetrieved(int request_id,
|
| const content::SpeechInputResult& result);
|
| - void OnSpeechRecordingComplete(int request_id);
|
| - void OnSpeechRecognitionComplete(int request_id);
|
| + void OnAudioEnded(int request_id);
|
| + void OnRecognitionEnded(int request_id);
|
| void OnSpeechRecognitionToggleSpeechInput();
|
|
|
| WebKit::WebSpeechInputListener* listener_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(SpeechInputDispatcher);
|
| + DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher);
|
| };
|
|
|
| #endif // CHROME_RENDERER_SPEECH_INPUT_DISPATCHER_H_
|
|
|