Index: content/renderer/speech_recognition_dispatcher.cc |
diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc |
index dea16bc5cfe07c1f668b1c89f87d54307e9aa873..cc69dd7823afa582ff4df5b99e54e025927235db 100644 |
--- a/content/renderer/speech_recognition_dispatcher.cc |
+++ b/content/renderer/speech_recognition_dispatcher.cc |
@@ -7,7 +7,7 @@ |
#include "base/basictypes.h" |
#include "base/strings/utf_string_conversions.h" |
#include "content/common/speech_recognition_messages.h" |
-#include "content/renderer/render_view_impl.h" |
+#include "content/renderer/render_frame_impl.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
#include "third_party/WebKit/public/platform/WebVector.h" |
#include "third_party/WebKit/public/web/WebSpeechGrammar.h" |
@@ -30,19 +30,13 @@ using blink::WebSpeechRecognizerClient; |
namespace content { |
SpeechRecognitionDispatcher::SpeechRecognitionDispatcher( |
- RenderViewImpl* render_view) |
- : RenderViewObserver(render_view), |
+ RenderFrame* render_frame) |
+ : RenderFrameObserver(render_frame), |
recognizer_client_(NULL), |
next_id_(1) {} |
SpeechRecognitionDispatcher::~SpeechRecognitionDispatcher() {} |
-void SpeechRecognitionDispatcher::AbortAllRecognitions() { |
- ResetAudioSink(); |
- Send(new SpeechRecognitionHostMsg_AbortAllRequests( |
- routing_id())); |
-} |
- |
bool SpeechRecognitionDispatcher::OnMessageReceived( |
const IPC::Message& message) { |
bool handled = true; |
@@ -104,7 +98,6 @@ void SpeechRecognitionDispatcher::start( |
msg_params.continuous = params.continuous(); |
msg_params.interim_results = params.interimResults(); |
msg_params.origin_url = params.origin().toString().utf8(); |
- msg_params.render_view_id = routing_id(); |
msg_params.request_id = GetOrCreateIDForHandle(handle); |
#if defined(ENABLE_WEBRTC) |
// Fall back to default input when the track is not allowed. |
@@ -113,7 +106,7 @@ void SpeechRecognitionDispatcher::start( |
msg_params.using_audio_track = false; |
#endif |
// The handle mapping will be removed in |OnRecognitionEnd|. |
- Send(new SpeechRecognitionHostMsg_StartRequest(msg_params)); |
+ Send(new SpeechRecognitionHostMsg_StartRequest(routing_id(), msg_params)); |
} |
void SpeechRecognitionDispatcher::stop( |