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

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

Issue 615133002: Add support for a virtual display on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ash/ dep from content Created 5 years, 9 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/virtual_display_capturer.cc ('k') | content/content_browser.gypi » ('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 1606e48c091c1aed3690f75bded3dadfee90d8d5..5f551449e090d5e27d5afbef134dd60bdad59893 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -30,6 +30,9 @@
#include "content/browser/media/capture/desktop_capture_device.h"
#if defined(USE_AURA)
#include "content/browser/media/capture/desktop_capture_device_aura.h"
+#if defined(OS_CHROMEOS)
+#include "content/browser/media/capture/virtual_display_capturer.h"
+#endif
#endif
#endif
@@ -414,8 +417,13 @@ VideoCaptureManager::DoStartDeviceOnDeviceThread(
if (desktop_id.type == DesktopMediaID::TYPE_AURA_WINDOW) {
video_capture_device.reset(
DesktopCaptureDeviceAura::Create(desktop_id));
+#if defined(OS_CHROMEOS)
+ } else if (desktop_id.type == DesktopMediaID::TYPE_AURA_VIRTUAL_SCREEN) {
+ video_capture_device.reset(
+ VirtualDisplayCapturer::Create(device_task_runner_, desktop_id));
+#endif // defined(OS_CHROMEOS)
} else
-#endif
+#endif // defined(USE_AURA)
if (desktop_id.type != DesktopMediaID::TYPE_NONE &&
desktop_id.type != DesktopMediaID::TYPE_AURA_WINDOW) {
video_capture_device = DesktopCaptureDevice::Create(desktop_id);
« no previous file with comments | « content/browser/media/capture/virtual_display_capturer.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698