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

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

Issue 2900583002: Revert of [Mojo Video Capture] Hook up video capture service behind a feature flag (Closed)
Patch Set: Rebase Created 3 years, 7 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_provider.h
diff --git a/content/browser/renderer_host/media/video_capture_provider.h b/content/browser/renderer_host/media/video_capture_provider.h
index 10135040df2585c75cc055ea7370d48cd103ea3c..f0b72bb33507b60b9a688c0ae1fdd1f3d52c0783 100644
--- a/content/browser/renderer_host/media/video_capture_provider.h
+++ b/content/browser/renderer_host/media/video_capture_provider.h
@@ -68,13 +68,8 @@ class LaunchedVideoCaptureDevice
base::OnceClosure done_cb) = 0;
};
-// Note: GetDeviceInfosAsync is only relevant for devices with
-// MediaStreamType == MEDIA_DEVICE_VIDEO_CAPTURE, i.e. camera devices.
class CONTENT_EXPORT VideoCaptureProvider {
public:
- using GetDeviceInfosCallback =
- base::Callback<void(const std::vector<media::VideoCaptureDeviceInfo>&)>;
-
virtual ~VideoCaptureProvider() {}
virtual void Uninitialize() = 0;
@@ -82,7 +77,9 @@ class CONTENT_EXPORT VideoCaptureProvider {
// The passed-in |result_callback| must guarantee that the called
// instance stays alive until |result_callback| is invoked.
virtual void GetDeviceInfosAsync(
- const GetDeviceInfosCallback& result_callback) = 0;
+ const base::Callback<
+ void(const std::vector<media::VideoCaptureDeviceInfo>&)>&
+ result_callback) = 0;
virtual std::unique_ptr<VideoCaptureDeviceLauncher>
CreateDeviceLauncher() = 0;

Powered by Google App Engine
This is Rietveld 408576698