Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(973)

Unified Diff: content/browser/speech/speech_input_manager.h

Issue 9387023: Revert 121810 - Move SpeechRecognizer delegate into its own header file and put it in the content... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/speech/speech_input_browsertest.cc ('k') | content/browser/speech/speech_input_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/speech/speech_input_manager.h
===================================================================
--- content/browser/speech/speech_input_manager.h (revision 121818)
+++ content/browser/speech/speech_input_manager.h (working copy)
@@ -9,32 +9,23 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
+#include "content/browser/speech/speech_recognizer.h"
#include "content/common/content_export.h"
-#include "content/public/browser/speech_recognizer_delegate.h"
#include "ui/gfx/rect.h"
-class AudioManager;
-
namespace content {
class ResourceContext;
class SpeechInputPreferences;
struct SpeechInputResult;
}
-namespace net {
-class URLRequestContextGetter;
-}
-
namespace speech_input {
-class SpeechRecognizer;
// This is the gatekeeper for speech recognition in the browser process. It
// handles requests received from various render views and makes sure only one
// of them can use speech recognition at a time. It also sends recognition
// results and status events to the render views when required.
-class CONTENT_EXPORT SpeechInputManager
- : public content::SpeechRecognizerDelegate {
+class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
public:
// Implemented by the dispatcher host to relay events to the render views.
class Delegate {
@@ -93,7 +84,7 @@
virtual void CancelAllRequestsWithDelegate(Delegate* delegate);
virtual void StopRecording(int caller_id);
- // Overridden from content::SpeechRecognizerDelegate:
+ // SpeechRecognizerDelegate methods.
virtual void DidStartReceivingAudio(int caller_id) OVERRIDE;
virtual void SetRecognitionResult(
int caller_id,
« no previous file with comments | « content/browser/speech/speech_input_browsertest.cc ('k') | content/browser/speech/speech_input_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698