summaryrefslogtreecommitdiffstats
path: root/chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h')
-rw-r--r--chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h b/chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h
index 1eba8a12ea2..1ed511b54ce 100644
--- a/chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h
+++ b/chromium/media/video/capture/mac/video_capture_device_qtkit_mac.h
@@ -39,7 +39,13 @@ class VideoCaptureDeviceMac;
std::vector<UInt8> adjustedFrame_;
}
-// Returns a dictionary of capture devices with friendly name and unique id.
+// Fills up the |deviceNames| dictionary of capture devices with friendly name
+// and unique id. No thread assumptions, but this method should run in UI
+// thread, see http://crbug.com/139164
++ (void)getDeviceNames:(NSMutableDictionary*)deviceNames;
+
+// Returns a dictionary of capture devices with friendly name and unique id, via
+// runing +getDeviceNames: on Main Thread.
+ (NSDictionary*)deviceNames;
// Initializes the instance and registers the frame receiver.