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

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

Issue 183743021: Implement MediaCaptureDevices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index fdb3b2c8c5e03c8b69578e4b5f072389d17ecc91..1acbfcaba91eb2a65f3a952a6d88484cdf31f245 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -18,6 +18,7 @@
#include "content/browser/browser_main_loop.h"
#include "content/browser/renderer_host/media/audio_input_device_manager.h"
#include "content/browser/renderer_host/media/device_request_message_filter.h"
+#include "content/browser/renderer_host/media/media_capture_devices_impl.h"
#include "content/browser/renderer_host/media/media_stream_requester.h"
#include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
#include "content/browser/renderer_host/media/video_capture_manager.h"
@@ -1739,11 +1740,6 @@ void MediaStreamManager::NotifyDevicesChanged(
MediaStreamType stream_type,
const StreamDeviceInfoArray& devices) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- MediaObserver* media_observer =
- GetContentClient()->browser()->GetMediaObserver();
- if (media_observer == NULL)
- return;
-
// Map the devices to MediaStreamDevices.
MediaStreamDevices new_devices;
for (StreamDeviceInfoArray::const_iterator it = devices.begin();
@@ -1752,9 +1748,11 @@ void MediaStreamManager::NotifyDevicesChanged(
}
if (IsAudioMediaType(stream_type)) {
- media_observer->OnAudioCaptureDevicesChanged(new_devices);
+ MediaCaptureDevicesImpl::GetInstance()->OnAudioCaptureDevicesChanged(
+ new_devices);
} else if (IsVideoMediaType(stream_type)) {
- media_observer->OnVideoCaptureDevicesChanged(new_devices);
+ MediaCaptureDevicesImpl::GetInstance()->OnVideoCaptureDevicesChanged(
+ new_devices);
} else {
NOTREACHED();
}

Powered by Google App Engine
This is Rietveld 408576698