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

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

Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UI tweaking and rebase Created 4 years, 4 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.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 9c0f5fa3f9aa42b2859da2100074a423579a0e81..7eaf1e1a893d0815ed33e50947ebcd0d25f01416 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -39,6 +39,9 @@
#if defined(USE_AURA)
#include "content/browser/media/capture/desktop_capture_device_aura.h"
#endif
+#if defined(OS_ANDROID)
+#include "content/browser/media/capture/screen_capture_device_android.h"
+#endif
#endif
#if defined(OS_MACOSX)
@@ -623,6 +626,9 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(
} else {
#if defined(USE_AURA)
video_capture_device = DesktopCaptureDeviceAura::Create(desktop_id);
+#elif defined(OS_ANDROID)
+ DCHECK(desktop_id.type == DesktopMediaID::TYPE_SCREEN);
+ video_capture_device = base::WrapUnique(new ScreenCaptureDeviceAndroid());
#endif
if (!video_capture_device)
video_capture_device = DesktopCaptureDevice::Create(desktop_id);

Powered by Google App Engine
This is Rietveld 408576698