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

Side by Side Diff: content/browser/speech/speech_recognition_manager_impl.cc

Issue 15907012: Implement SpeechRecognizerImplAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 7 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/speech/speech_recognition_manager_impl.h" 5 #include "content/browser/speech/speech_recognition_manager_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/browser_main_loop.h" 8 #include "content/browser/browser_main_loop.h"
9 #include "content/browser/renderer_host/media/media_stream_manager.h" 9 #include "content/browser/renderer_host/media/media_stream_manager.h"
10 #include "content/browser/speech/google_one_shot_remote_engine.h" 10 #include "content/browser/speech/google_one_shot_remote_engine.h"
11 #include "content/browser/speech/google_streaming_remote_engine.h" 11 #include "content/browser/speech/google_streaming_remote_engine.h"
12 #include "content/browser/speech/speech_recognition_engine.h" 12 #include "content/browser/speech/speech_recognition_engine.h"
13 #include "content/browser/speech/speech_recognizer_impl.h" 13 #include "content/browser/speech/speech_recognizer_impl.h"
14 #include "content/browser/speech/speech_recognizer_impl_android.h"
14 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
16 #include "content/public/browser/resource_context.h" 17 #include "content/public/browser/resource_context.h"
17 #include "content/public/browser/speech_recognition_event_listener.h" 18 #include "content/public/browser/speech_recognition_event_listener.h"
18 #include "content/public/browser/speech_recognition_manager_delegate.h" 19 #include "content/public/browser/speech_recognition_manager_delegate.h"
19 #include "content/public/browser/speech_recognition_session_config.h" 20 #include "content/public/browser/speech_recognition_session_config.h"
20 #include "content/public/browser/speech_recognition_session_context.h" 21 #include "content/public/browser/speech_recognition_session_context.h"
21 #include "content/public/common/speech_recognition_error.h" 22 #include "content/public/common/speech_recognition_error.h"
22 #include "content/public/common/speech_recognition_result.h" 23 #include "content/public/common/speech_recognition_result.h"
23 #include "media/audio/audio_manager.h" 24 #include "media/audio/audio_manager.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 126 }
126 127
127 google_remote_engine->SetConfig(remote_engine_config); 128 google_remote_engine->SetConfig(remote_engine_config);
128 129
129 session.recognizer = new SpeechRecognizerImpl( 130 session.recognizer = new SpeechRecognizerImpl(
130 this, 131 this,
131 session_id, 132 session_id,
132 !config.continuous, 133 !config.continuous,
133 google_remote_engine); 134 google_remote_engine);
134 #else 135 #else
135 // TODO(janx): Implement a SpeechRecognizerImplAndroid with a JNI interface 136 session.recognizer = new SpeechRecognizerImplAndroid(
136 // forwarding calls to Android's platform speech recognition service (see 137 this,
137 // crbug.com/222352). 138 session_id);
138 session.recognizer = NULL;
139 #endif 139 #endif
140 return session_id; 140 return session_id;
141 } 141 }
142 142
143 void SpeechRecognitionManagerImpl::StartSession(int session_id) { 143 void SpeechRecognitionManagerImpl::StartSession(int session_id) {
144 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 144 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
145 if (!SessionExists(session_id)) 145 if (!SessionExists(session_id))
146 return; 146 return;
147 147
148 // If there is another active session, abort that. 148 // If there is another active session, abort that.
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 668
669 SpeechRecognitionManagerImpl::Session::Session() 669 SpeechRecognitionManagerImpl::Session::Session()
670 : id(kSessionIDInvalid), 670 : id(kSessionIDInvalid),
671 listener_is_active(true) { 671 listener_is_active(true) {
672 } 672 }
673 673
674 SpeechRecognitionManagerImpl::Session::~Session() { 674 SpeechRecognitionManagerImpl::Session::~Session() {
675 } 675 }
676 676
677 } // namespace content 677 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698