| Index: content/browser/speech/input_tag_speech_dispatcher_host.h
|
| diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.h b/content/browser/speech/input_tag_speech_dispatcher_host.h
|
| index 896da27fdeb7b31a943ae6a06f5611aa3fae99bb..d1e99e4c951e9d5e374639a7d0c4d5712c26c36e 100644
|
| --- a/content/browser/speech/input_tag_speech_dispatcher_host.h
|
| +++ b/content/browser/speech/input_tag_speech_dispatcher_host.h
|
| @@ -15,25 +15,23 @@
|
| struct InputTagSpeechHostMsg_StartRecognition_Params;
|
|
|
| namespace content {
|
| +
|
| class SpeechRecognitionManager;
|
| class SpeechRecognitionPreferences;
|
| struct SpeechRecognitionResult;
|
| -}
|
| -
|
| -namespace speech {
|
|
|
| // InputTagSpeechDispatcherHost is a delegate for Speech API messages used by
|
| // RenderMessageFilter. Basically it acts as a proxy, relaying the events coming
|
| // from the SpeechRecognitionManager to IPC messages (and vice versa).
|
| // It's the complement of SpeechRecognitionDispatcher (owned by RenderView).
|
| class CONTENT_EXPORT InputTagSpeechDispatcherHost
|
| - : public content::BrowserMessageFilter,
|
| - public content::SpeechRecognitionEventListener {
|
| + : public BrowserMessageFilter,
|
| + public SpeechRecognitionEventListener {
|
| public:
|
| InputTagSpeechDispatcherHost(
|
| int render_process_id,
|
| net::URLRequestContextGetter* url_request_context_getter,
|
| - content::SpeechRecognitionPreferences* recognition_preferences);
|
| + SpeechRecognitionPreferences* recognition_preferences);
|
|
|
| // SpeechRecognitionEventListener methods.
|
| virtual void OnRecognitionStart(int session_id) OVERRIDE;
|
| @@ -44,18 +42,21 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
|
| virtual void OnAudioEnd(int session_id) OVERRIDE;
|
| virtual void OnRecognitionEnd(int session_id) OVERRIDE;
|
| virtual void OnRecognitionResult(
|
| - int session_id, const content::SpeechRecognitionResult& result) OVERRIDE;
|
| + int session_id,
|
| + const SpeechRecognitionResult& result) OVERRIDE;
|
| virtual void OnRecognitionError(
|
| - int session_id, const content::SpeechRecognitionError& error) OVERRIDE;
|
| - virtual void OnAudioLevelsChange(
|
| - int session_id, float volume, float noise_volume) OVERRIDE;
|
| + int session_id,
|
| + const SpeechRecognitionError& error) OVERRIDE;
|
| + virtual void OnAudioLevelsChange(int session_id,
|
| + float volume,
|
| + float noise_volume) OVERRIDE;
|
|
|
| - // content::BrowserMessageFilter implementation.
|
| + // BrowserMessageFilter implementation.
|
| virtual bool OnMessageReceived(const IPC::Message& message,
|
| bool* message_was_ok) OVERRIDE;
|
|
|
| // Singleton manager setter useful for tests.
|
| - static void SetManagerForTests(content::SpeechRecognitionManager* manager);
|
| + static void SetManagerForTests(SpeechRecognitionManager* manager);
|
|
|
| private:
|
| virtual ~InputTagSpeechDispatcherHost();
|
| @@ -67,17 +68,17 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
|
|
|
| // Returns the speech recognition manager to forward events to, creating one
|
| // if needed.
|
| - content::SpeechRecognitionManager* manager();
|
| + SpeechRecognitionManager* manager();
|
|
|
| int render_process_id_;
|
| scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
|
| - scoped_refptr<content::SpeechRecognitionPreferences> recognition_preferences_;
|
| + scoped_refptr<SpeechRecognitionPreferences> recognition_preferences_;
|
|
|
| - static content::SpeechRecognitionManager* manager_for_tests_;
|
| + static SpeechRecognitionManager* manager_for_tests_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InputTagSpeechDispatcherHost);
|
| };
|
|
|
| -} // namespace speech
|
| +} // namespace content
|
|
|
| #endif // CONTENT_BROWSER_SPEECH_INPUT_TAG_SPEECH_DISPATCHER_HOST_H_
|
|
|