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

Side by Side Diff: chrome/browser/speech/chrome_speech_input_manager.cc

Issue 9371025: Move resource_context.h to content/public/browser. Remove the workaround in its destructor since ... (Closed) Base URL: svn://chrome-svn/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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/speech/chrome_speech_input_manager.h" 5 #include "chrome/browser/speech/chrome_speech_input_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
11 #include "base/threading/thread_restrictions.h" 11 #include "base/threading/thread_restrictions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/tab_contents/tab_util.h" 16 #include "chrome/browser/tab_contents/tab_util.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "content/browser/resource_context.h"
19 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/resource_context.h"
20 #include "content/public/common/speech_input_result.h" 20 #include "content/public/common/speech_input_result.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "media/audio/audio_manager.h" 22 #include "media/audio/audio_manager.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 24
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 #include "chrome/installer/util/wmi.h" 26 #include "chrome/installer/util/wmi.h"
27 #endif 27 #endif
28 28
29 using content::BrowserThread; 29 using content::BrowserThread;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 StartRecognitionForRequest(caller_id); 221 StartRecognitionForRequest(caller_id);
222 } 222 }
223 } 223 }
224 224
225 void ChromeSpeechInputManager::InfoBubbleFocusChanged(int caller_id) { 225 void ChromeSpeechInputManager::InfoBubbleFocusChanged(int caller_id) {
226 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 226 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
227 OnFocusChanged(caller_id); 227 OnFocusChanged(caller_id);
228 } 228 }
229 229
230 } // namespace speech_input 230 } // namespace speech_input
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698