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

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

Issue 2605973002: WebContentsVideoCapture Cleanup: Gut-out dead code, and tighten BUILDs. (Closed)
Patch Set: REBASE Created 3 years, 12 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
« no previous file with comments | « content/browser/media/capture/web_contents_video_capture_device_unittest.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index a316e94b61e94e5532126a83af2c85dbc3036870..a75d86e28193333ea163cc881ffa3c0dc9adfae5 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -614,7 +614,9 @@ VideoCaptureManager::DoStartTabCaptureOnDeviceThread(
DCHECK(IsOnDeviceThread());
std::unique_ptr<VideoCaptureDevice> video_capture_device;
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
video_capture_device = WebContentsVideoCaptureDevice::Create(id);
+#endif
if (!video_capture_device) {
device_client->OnError(FROM_HERE, "Could not create capture device");
@@ -642,6 +644,7 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(
}
if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) {
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
video_capture_device = WebContentsVideoCaptureDevice::Create(id);
IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED);
if (desktop_id.audio_share) {
@@ -649,6 +652,7 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(
} else {
IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED_WITHOUT_AUDIO);
}
+#endif
} else {
#if defined(OS_ANDROID)
video_capture_device = base::MakeUnique<ScreenCaptureDeviceAndroid>();
« no previous file with comments | « content/browser/media/capture/web_contents_video_capture_device_unittest.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698