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

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

Issue 9387023: Revert 121810 - Move SpeechRecognizer delegate into its own header file and put it in the content... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_input_manager.h" 5 #include "content/browser/speech/speech_input_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/renderer_host/render_view_host.h" 8 #include "content/browser/renderer_host/render_view_host.h"
9 #include "content/browser/speech/speech_recognizer.h"
10 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
11 #include "content/public/browser/render_view_host_delegate.h" 10 #include "content/public/browser/render_view_host_delegate.h"
12 #include "content/public/browser/resource_context.h" 11 #include "content/public/browser/resource_context.h"
13 #include "content/public/browser/speech_input_preferences.h" 12 #include "content/public/browser/speech_input_preferences.h"
14 #include "content/public/common/view_type.h" 13 #include "content/public/common/view_type.h"
15 #include "media/audio/audio_manager.h" 14 #include "media/audio/audio_manager.h"
16 15
17 using content::BrowserThread; 16 using content::BrowserThread;
18 17
19 namespace speech_input { 18 namespace speech_input {
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 305
307 SpeechInputManager::SpeechInputRequest::SpeechInputRequest() 306 SpeechInputManager::SpeechInputRequest::SpeechInputRequest()
308 : delegate(NULL), 307 : delegate(NULL),
309 is_active(false) { 308 is_active(false) {
310 } 309 }
311 310
312 SpeechInputManager::SpeechInputRequest::~SpeechInputRequest() { 311 SpeechInputManager::SpeechInputRequest::~SpeechInputRequest() {
313 } 312 }
314 313
315 } // namespace speech_input 314 } // namespace speech_input
OLDNEW
« no previous file with comments | « content/browser/speech/speech_input_manager.h ('k') | content/browser/speech/speech_recognizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698