Index: media/video/capture/mac/video_capture_device_mac.mm |
diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm |
index b15a810705c6204f8ba5d89d06ed8f9ce8f64bb5..cff39331d09cce5cf2b901c996ee211187a9a1b6 100644 |
--- a/media/video/capture/mac/video_capture_device_mac.mm |
+++ b/media/video/capture/mac/video_capture_device_mac.mm |
@@ -16,13 +16,11 @@ void VideoCaptureDevice::GetDeviceNames(Names* device_names) { |
// Loop through all available devices and add to |device_names|. |
device_names->clear(); |
- // TODO(mflodman) Return name and id as NSArray* instead of QTCaptureDevice*. |
- for (QTCaptureDevice* device in [VideoCaptureDeviceQTKit deviceNames]) { |
+ NSDictionary* capture_devices = [VideoCaptureDeviceQTKit deviceNames]; |
+ for (NSString* key in capture_devices) { |
Name name; |
- NSString* qt_device_name = [device localizedDisplayName]; |
- name.device_name = [qt_device_name UTF8String]; |
- NSString* qt_unique_id = [device uniqueID]; |
- name.unique_id = [qt_unique_id UTF8String]; |
+ name.device_name = [[capture_devices valueForKey:key] UTF8String]; |
+ name.unique_id = [key UTF8String]; |
device_names->push_back(name); |
} |
} |