Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / media / desktop_capture_device.cc

diff --git a/src/content/browser/renderer_host/media/desktop_capture_device.cc b/src/content/browser/renderer_host/media/desktop_capture_device.cc
index 7c78df0..74ecd80 100644 (file)
--- a/src/content/browser/renderer_host/media/desktop_capture_device.cc
+++ b/src/content/browser/renderer_host/media/desktop_capture_device.cc
@@ -366,13 +366,12 @@ scoped_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
 
   switch (source.type) {
     case DesktopMediaID::TYPE_SCREEN: {
-      scoped_ptr<webrtc::DesktopCapturer> screen_capturer;
+      scoped_ptr<webrtc::ScreenCapturer> screen_capturer;
       screen_capturer.reset(webrtc::ScreenCapturer::Create(options));
-      if (screen_capturer) {
+      if (screen_capturer && screen_capturer->SelectScreen(source.id)) {
         capturer.reset(new webrtc::DesktopAndCursorComposer(
             screen_capturer.release(),
-            webrtc::MouseCursorMonitor::CreateForScreen(
-                options, webrtc::kFullDesktopScreenId)));
+            webrtc::MouseCursorMonitor::CreateForScreen(options, source.id)));
       }
       break;
     }