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

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

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
« no previous file with comments | « content/browser/speech/speech_input_manager.h ('k') | content/browser/speech/speech_input_preferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/speech/speech_input_manager.cc
diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc
index c247bb6f752a110df4efacd9bbc461c38fb911c4..5a37ec78a4126f8b5782d841dd72326d6daba4ef 100644
--- a/content/browser/speech/speech_input_manager.cc
+++ b/content/browser/speech/speech_input_manager.cc
@@ -5,13 +5,13 @@
#include "content/browser/speech/speech_input_manager.h"
#include "content/browser/browser_thread.h"
+#include "content/browser/speech/speech_input_preferences.h"
#include "media/audio/audio_manager.h"
namespace speech_input {
SpeechInputManager::SpeechInputManager()
: can_report_metrics_(false),
- censor_results_(true),
recording_caller_id_(0) {
}
@@ -52,7 +52,9 @@ void SpeechInputManager::StartRecognition(
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) {
DCHECK(!HasPendingRequest(caller_id));
ShowRecognitionRequested(
@@ -62,7 +64,8 @@ void SpeechInputManager::StartRecognition(
SpeechInputRequest* request = &requests_[caller_id];
request->delegate = delegate;
request->recognizer = new SpeechRecognizer(
- this, caller_id, language, grammar, censor_results(),
+ this, caller_id, language, grammar, context_getter,
+ speech_input_prefs->censor_results(),
request_info_, can_report_metrics_ ? origin_url : "");
request->is_active = false;
« no previous file with comments | « content/browser/speech/speech_input_manager.h ('k') | content/browser/speech/speech_input_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698