summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 17:05:44 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 17:05:44 +0000
commitbc0615506686a509ffe1031a2d77b3f9a22e109e (patch)
tree7e7274b5bb7b91fd0d588f4ddafd2a586a91bb63 /content
parenta62ee58d3ec8f26754e19c3aa8501c3090c8c5a8 (diff)
downloadchromium_src-bc0615506686a509ffe1031a2d77b3f9a22e109e.zip
chromium_src-bc0615506686a509ffe1031a2d77b3f9a22e109e.tar.gz
chromium_src-bc0615506686a509ffe1031a2d77b3f9a22e109e.tar.bz2
Merge 83140 - Enable visible profanity filter for speech input and correct a mistake in the volume meter image.BUG=noneTEST=manual, test speech input with some profanity and verify that the censored words have all but the first letter shown as '*'Review URL: http://codereview.chromium.org/6901050
TBR=satish@chromium.org git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@83170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/speech/speech_recognition_request.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc
index 19d8204..6a4559f 100644
--- a/content/browser/speech/speech_recognition_request.cc
+++ b/content/browser/speech/speech_recognition_request.cc
@@ -20,7 +20,8 @@
namespace {
const char* const kDefaultSpeechRecognitionUrl =
- "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
+ "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&"
+ "pfilter=2&";
const char* const kHypothesesString = "hypotheses";
const char* const kUtteranceString = "utterance";
const char* const kConfidenceString = "confidence";