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

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager.cc

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Set svn eol properties for a couple of files Created 9 years 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/renderer_host/media/audio_input_device_manager.cc
===================================================================
--- content/browser/renderer_host/media/audio_input_device_manager.cc (revision 114012)
+++ content/browser/renderer_host/media/audio_input_device_manager.cc (working copy)
@@ -21,9 +21,10 @@
// Starting id for the first capture session.
const int kFirstSessionId = AudioInputDeviceManager::kFakeOpenSessionId + 1;
-AudioInputDeviceManager::AudioInputDeviceManager()
+AudioInputDeviceManager::AudioInputDeviceManager(AudioManager* audio_manager)
: listener_(NULL),
- next_capture_session_id_(kFirstSessionId) {
+ next_capture_session_id_(kFirstSessionId),
+ audio_manager_(audio_manager) {
}
AudioInputDeviceManager::~AudioInputDeviceManager() {
@@ -46,7 +47,7 @@
DCHECK(listener_);
media::AudioDeviceNames device_names;
- AudioManager::GetAudioManager()->GetAudioInputDeviceNames(&device_names);
+ audio_manager_->GetAudioInputDeviceNames(&device_names);
StreamDeviceInfoArray* devices = new StreamDeviceInfoArray;
for (media::AudioDeviceNames::iterator it = device_names.begin();

Powered by Google App Engine
This is Rietveld 408576698