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

Unified Diff: content/browser/renderer_host/media/video_capture_manager.h

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactoring of VideoCaptureDeviceFactory interface Created 4 years, 5 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/video_capture_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index d69bd897529dced8f77c13cf174c967c798d5dab..fdfa35036ef96b66c45cb90e3501a78e8501c58d 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -180,6 +180,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
using SessionMap = std::map<media::VideoCaptureSessionId, MediaStreamDevice>;
using DeviceEntries = std::vector<std::unique_ptr<DeviceEntry>>;
using DeviceStartQueue = std::list<CaptureDeviceStartRequest>;
+ using VideoCaptureDeviceDescriptor = media::VideoCaptureDeviceDescriptor;
+ using VideoCaptureDeviceDescriptors = media::VideoCaptureDeviceDescriptors;
~VideoCaptureManager() override;
@@ -203,7 +205,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
on_devices_enumerated_callback,
MediaStreamType stream_type,
const media::VideoCaptureDeviceInfos& old_device_info_cache,
- std::unique_ptr<VideoCaptureDevice::Names> names_snapshot);
+ std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors_snapshot);
// Checks to see if |entry| has no clients left on its controller. If so,
// remove it from the list of devices, and delete it asynchronously. |entry|
@@ -252,7 +254,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
// a DeviceEntry in |devices_|. Ownership of |client| passes to
// the device.
std::unique_ptr<VideoCaptureDevice> DoStartDeviceCaptureOnDeviceThread(
- const VideoCaptureDevice::Name& name,
+ const VideoCaptureDeviceDescriptor& descriptor,
const media::VideoCaptureParams& params,
std::unique_ptr<VideoCaptureDevice::Client> client);

Powered by Google App Engine
This is Rietveld 408576698