content/browser/speech/speech_recognizer_impl.cc - Issue 10233010: Introducing new data types and IPC messages for scripted JS speech recognition APIs (Speech CL2.0)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10233010: Introducing new data types and IPC messages for scripted JS speech recognition APIs (Speech CL2.0) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added CONTENT_EXPORT to SpeechRecognitionEngine::Config Created 8 years, 7 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_recognition_manager_impl.cc ('k') | content/browser/speech/speech_recognizer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/speech/speech_recognizer_impl.cc

diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc

index 9f5f7e56f4ca3368818185b941c71b7e50647838..241055a392e3cf9da8e2f497f4dcc2fec7b0f327 100644

--- a/content/browser/speech/speech_recognizer_impl.cc

+++ b/content/browser/speech/speech_recognizer_impl.cc

@@ -14,6 +14,7 @@

#include "content/public/browser/speech_recognition_event_listener.h"

#include "content/public/browser/speech_recognizer.h"

#include "content/public/common/speech_recognition_error.h"

+#include "content/public/common/speech_recognition_grammar.h"

#include "content/public/common/speech_recognition_result.h"

#include "net/url_request/url_request_context_getter.h"

@@ -21,6 +22,7 @@ using content::BrowserMainLoop;

using content::BrowserThread;

using content::SpeechRecognitionError;

using content::SpeechRecognitionEventListener;

+using content::SpeechRecognitionGrammar;

using content::SpeechRecognitionResult;

using content::SpeechRecognizer;

using media::AudioInputController;

@@ -79,9 +81,10 @@ SpeechRecognizer* SpeechRecognizer::Create(

bool filter_profanities,

const std::string& hardware_info,

const std::string& origin_url) {

- speech::GoogleOneShotRemoteEngineConfig remote_engine_config;

+ speech::SpeechRecognitionEngineConfig remote_engine_config;

remote_engine_config.language = language;

- remote_engine_config.grammar = grammar;

+ if (!grammar.empty())

+ remote_engine_config.grammars.push_back(SpeechRecognitionGrammar(grammar));

remote_engine_config.audio_sample_rate =

speech::SpeechRecognizerImpl::kAudioSampleRate;

remote_engine_config.audio_num_bits_per_sample =