| Index: content/renderer/speech_recognition_dispatcher.h
|
| diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h
|
| index 10241956e8142013e10bdd42b48696e61f484cf5..e7e02c25c5c137746692dc8eaccd9c32bc686ccb 100644
|
| --- a/content/renderer/speech_recognition_dispatcher.h
|
| +++ b/content/renderer/speech_recognition_dispatcher.h
|
| @@ -12,7 +12,7 @@
|
| #include "base/memory/shared_memory.h"
|
| #include "base/sync_socket.h"
|
| #include "content/public/common/speech_recognition_result.h"
|
| -#include "content/public/renderer/render_view_observer.h"
|
| +#include "content/public/renderer/render_frame_observer.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
|
| #include "third_party/WebKit/public/platform/WebVector.h"
|
| #include "third_party/WebKit/public/web/WebSpeechRecognitionHandle.h"
|
| @@ -23,7 +23,6 @@ class AudioParameters;
|
| }
|
|
|
| namespace content {
|
| -class RenderViewImpl;
|
| #if defined(ENABLE_WEBRTC)
|
| class SpeechRecognitionAudioSink;
|
| #endif
|
| @@ -32,19 +31,17 @@ struct SpeechRecognitionResult;
|
|
|
| // SpeechRecognitionDispatcher is a delegate for methods used by WebKit for
|
| // scripted JS speech APIs. It's the complement of
|
| -// SpeechRecognitionDispatcherHost (owned by RenderViewHost).
|
| -class SpeechRecognitionDispatcher : public RenderViewObserver,
|
| +// SpeechRecognitionDispatcherHost (owned by RenderFrameHost).
|
| +class SpeechRecognitionDispatcher : public RenderFrameObserver,
|
| public blink::WebSpeechRecognizer {
|
| public:
|
| - explicit SpeechRecognitionDispatcher(RenderViewImpl* render_view);
|
| + explicit SpeechRecognitionDispatcher(RenderFrame* render_frame);
|
| virtual ~SpeechRecognitionDispatcher();
|
|
|
| - // Aborts all speech recognitions.
|
| - void AbortAllRecognitions();
|
| -
|
| private:
|
| - // RenderViewObserver implementation.
|
| + // RenderFrameObserver implementation.
|
| bool OnMessageReceived(const IPC::Message& message) override;
|
| + void WasHidden() override;
|
|
|
| // blink::WebSpeechRecognizer implementation.
|
| virtual void start(const blink::WebSpeechRecognitionHandle&,
|
|
|