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..e2e32c269fc9af8d14a7367303fbf8b5323e0729 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) |
@@ -621,7 +624,9 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread( |
video_capture_device.reset(WebContentsVideoCaptureDevice::Create(id)); |
IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED); |
} else { |
-#if defined(USE_AURA) |
+#if defined(OS_ANDROID) |
+ video_capture_device = base::WrapUnique(new ScreenCaptureDeviceAndroid()); |
piman
2016/09/09 00:52:54
nit: base::MakeUnique<ScreenCaptureDeviceAndroid>(
braveyao
2016/09/12 23:23:20
Done.
|
+#elif defined(USE_AURA) |
video_capture_device = DesktopCaptureDeviceAura::Create(desktop_id); |
#endif |
if (!video_capture_device) |
@@ -1140,7 +1145,7 @@ void VideoCaptureManager::SetDesktopCaptureWindowIdOnDeviceThread( |
media::VideoCaptureDevice* device, |
gfx::NativeViewId window_id) { |
DCHECK(IsOnDeviceThread()); |
-#if defined(ENABLE_SCREEN_CAPTURE) |
+#if !defined(OS_ANDROID) |
DesktopCaptureDevice* desktop_device = |
static_cast<DesktopCaptureDevice*>(device); |
desktop_device->SetNotificationWindowId(window_id); |