content/browser/speech/speech_recognizer.cc - Issue 10933018: Speech JavaScript API: Use the MediaStreamManager to ask for user permission.

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.cc

Issue 10933018: Speech JavaScript API: Use the MediaStreamManager to ask for user permission. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address xians's comments Created 8 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

« content/browser/speech/speech_recognition_manager_impl.cc ('K') | « content/browser/speech/speech_recognition_manager_impl.cc ('k') | content/public/browser/speech_recognition_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/speech/speech_recognizer.cc

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

index 66a2fb3f0172308e5464ff8f7d04ae52e3689232..8078ba1615cfe8435d32929d48ae694399da2f60 100644

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

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

@@ -255,12 +255,13 @@ SpeechRecognizer::ExecuteTransitionAndGetNextState(

// TODO(primiano): restore UNREACHABLE_CONDITION on EVENT_ABORT and

// EVENT_STOP_CAPTURE below once speech input extensions are fixed.

case EVENT_ABORT:

- return DoNothing(event_args);

+ return AbortSilently(event_args);

case EVENT_START:

return StartRecording(event_args);

- case EVENT_STOP_CAPTURE: // Corner cases related to queued messages

- case EVENT_AUDIO_DATA: // being lately dispatched.

- case EVENT_ENGINE_RESULT:

+ case EVENT_STOP_CAPTURE:

+ return AbortSilently(event_args);

+ case EVENT_AUDIO_DATA: // Corner cases related to queued messages

+ case EVENT_ENGINE_RESULT: // being lately dispatched.

case EVENT_ENGINE_ERROR:

case EVENT_AUDIO_ERROR:

return DoNothing(event_args);