Make SpeechRecognition per RenderFrame instead of per RenderView.

content/renderer/speech_recognition_dispatcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
 #define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #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"
 #include "third_party/WebKit/public/web/WebSpeechRecognizer.h"
 
 namespace media {
 class AudioParameters;
 }
 
 namespace content {
-class RenderViewImpl;
 #if defined(ENABLE_WEBRTC)
 class SpeechRecognitionAudioSink;
 #endif
 struct SpeechRecognitionError;
 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;
 
   // blink::WebSpeechRecognizer implementation.
   virtual void start(const blink::WebSpeechRecognitionHandle&,
                      const blink::WebSpeechRecognitionParams&,
                      blink::WebSpeechRecognizerClient*);
   virtual void stop(const blink::WebSpeechRecognitionHandle&,
                     blink::WebSpeechRecognizerClient*);
   virtual void abort(const blink::WebSpeechRecognitionHandle&,
                      blink::WebSpeechRecognizerClient*);
@@ skipping 33 matching lines @@
   typedef std::map<int, blink::WebSpeechRecognitionHandle> HandleMap;
   HandleMap handle_map_;
   int next_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_