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

Unified Diff: content/browser/speech/speech_recognition_request.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: Update SpeechInputPreferences when preference changes 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_recognition_request.cc
diff --git a/content/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc
index 52345e04877a1d2f99b16f27664c081591ff0c89..8c06b29a3859f544e4cdd63e8f28c70ac37ccc0f 100644
--- a/content/browser/speech/speech_recognition_request.cc
+++ b/content/browser/speech/speech_recognition_request.cc
@@ -10,6 +10,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/values.h"
+#include "content/browser/speech/speech_input_preferences.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_context.h"
@@ -122,7 +123,7 @@ SpeechRecognitionRequest::~SpeechRecognitionRequest() {}
void SpeechRecognitionRequest::Start(const std::string& language,
const std::string& grammar,
- bool censor_results,
+ SpeechInputPreferences* speech_input_prefs,
const std::string& hardware_info,
const std::string& origin_url,
const std::string& content_type) {
@@ -151,7 +152,8 @@ void SpeechRecognitionRequest::Start(const std::string& language,
if (!hardware_info.empty())
parts.push_back("xhw=" + net::EscapeQueryParamValue(hardware_info, true));
parts.push_back("maxresults=" + base::IntToString(kMaxResults));
- parts.push_back(censor_results ? "pfilter=2" : "pfilter=0");
+ parts.push_back(speech_input_prefs->censor_results()
+ ? "pfilter=2" : "pfilter=0");
GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));

Powered by Google App Engine
This is Rietveld 408576698