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

Unified Diff: chrome/browser/ui/webui/options/media_devices_selection_handler.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: chrome/browser/ui/webui/options/media_devices_selection_handler.cc
diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc
index 45897f63c7800b3fb223dd6bd1c8ed86bbc14f99..bf90883d2647f289a8a0d7d1f63af5089a4e5a77 100644
--- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc
+++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc
@@ -21,7 +21,7 @@ namespace options {
MediaDevicesSelectionHandler::MediaDevicesSelectionHandler() {}
MediaDevicesSelectionHandler::~MediaDevicesSelectionHandler() {
- MediaCaptureDevicesDispatcher::GetInstance()->RemoveObserver(this);
+ content::MediaCaptureDevices::GetInstance()->RemoveObserver(this);
}
void MediaDevicesSelectionHandler::GetLocalizedValues(
@@ -38,7 +38,7 @@ void MediaDevicesSelectionHandler::GetLocalizedValues(
void MediaDevicesSelectionHandler::InitializePage() {
// Register to the device observer list to get up-to-date device lists.
- MediaCaptureDevicesDispatcher::GetInstance()->AddObserver(this);
+ content::MediaCaptureDevices::GetInstance()->AddObserver(this);
// Update the device selection menus.
UpdateDevicesMenuForType(AUDIO);
@@ -130,11 +130,11 @@ void MediaDevicesSelectionHandler::UpdateDevicesMenuForType(DeviceType type) {
content::MediaStreamDevices devices;
switch (type) {
case AUDIO:
- devices = MediaCaptureDevicesDispatcher::GetInstance()->
+ devices = content::MediaCaptureDevices::GetInstance()->
GetAudioCaptureDevices();
break;
case VIDEO:
- devices = MediaCaptureDevicesDispatcher::GetInstance()->
+ devices = content::MediaCaptureDevices::GetInstance()->
GetVideoCaptureDevices();
break;
}

Powered by Google App Engine
This is Rietveld 408576698