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

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

Issue 7989001: Remove use of default request context and fix use of speech censor flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separate overriden methods in profile_impl.h Created 9 years, 3 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
Index: content/browser/speech/speech_input_manager.h
diff --git a/content/browser/speech/speech_input_manager.h b/content/browser/speech/speech_input_manager.h
index af14b0d8adfdbd84824463afd7a8af52beb6d7a9..c690780f924df4bf7c1faaff7a3587c4c8a7fc45 100644
--- a/content/browser/speech/speech_input_manager.h
+++ b/content/browser/speech/speech_input_manager.h
@@ -14,6 +14,8 @@
#include "content/common/speech_input_result.h"
#include "ui/gfx/rect.h"
+class SpeechInputPreferences;
+
namespace speech_input {
// This is the gatekeeper for speech recognition in the browser process. It
@@ -58,7 +60,9 @@ class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
const gfx::Rect& element_rect,
const std::string& language,
const std::string& grammar,
- const std::string& origin_url);
+ const std::string& origin_url,
+ net::URLRequestContextGetter* context_getter,
+ SpeechInputPreferences* speech_input_prefs);
virtual void CancelRecognition(int caller_id);
virtual void CancelAllRequestsWithDelegate(Delegate* delegate);
virtual void StopRecording(int caller_id);
@@ -75,10 +79,6 @@ class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
virtual void DidCompleteEnvironmentEstimation(int caller_id);
virtual void SetInputVolume(int caller_id, float volume, float noise_volume);
- void set_censor_results(bool censor) { censor_results_ = censor; }
-
- bool censor_results() { return censor_results_; }
-
protected:
// The pure virtual methods are used for displaying the current state of
// recognition and for fetching optional request information.
@@ -144,7 +144,6 @@ class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
SpeechRecognizerMap requests_;
std::string request_info_;
bool can_report_metrics_;
- bool censor_results_;
int recording_caller_id_;
};
« no previous file with comments | « content/browser/speech/speech_input_dispatcher_host.cc ('k') | content/browser/speech/speech_input_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698