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

Unified Diff: content/browser/speech/speech_input_manager.h

Issue 9433006: Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/speech/speech_input_manager.h
===================================================================
--- content/browser/speech/speech_input_manager.h (revision 123165)
+++ content/browser/speech/speech_input_manager.h (working copy)
@@ -49,16 +49,15 @@
// Invokes the platform provided microphone settings UI in a non-blocking way,
// via the BrowserThread::FILE thread.
- static void ShowAudioInputSettings(AudioManager* audio_manager);
+ static void ShowAudioInputSettings();
- // Same as ShowAudioInputSettings above but can be called from the UI thread
- // where the caller has a pointer to a resource context, but due to not
- // running on the IO thread, cannot access its properties.
- static void ShowAudioInputSettingsFromUI(
- content::ResourceContext* resource_context);
-
virtual ~SpeechInputManager();
+ // These are wrappers around AudioManager.
+ bool HasAudioInputDevices();
+ bool IsRecordingInProcess();
+ string16 GetAudioInputDeviceModel();
+
// Handlers for requests from render views.
// |delegate| is a weak pointer and should remain valid until
@@ -77,8 +76,7 @@
const std::string& grammar,
const std::string& origin_url,
net::URLRequestContextGetter* context_getter,
- content::SpeechInputPreferences* speech_input_prefs,
- AudioManager* audio_manager);
+ content::SpeechInputPreferences* speech_input_prefs);
virtual void CancelRecognition(int caller_id);
virtual void CancelAllRequestsWithDelegate(
content::SpeechInputManagerDelegate* delegate);
@@ -105,8 +103,7 @@
// recognition and for fetching optional request information.
// Get the optional request information if available.
- virtual void GetRequestInfo(AudioManager* audio_manager,
- bool* can_report_metrics,
+ virtual void GetRequestInfo(bool* can_report_metrics,
std::string* request_info) = 0;
// Called when recognition has been requested from point |element_rect_| on
« no previous file with comments | « content/browser/speech/speech_input_dispatcher_host.cc ('k') | content/browser/speech/speech_input_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698