M61: fix desktopcapturemonitor

rogerwang · rogerwang · commit 468c92cc3f03 · 2017-08-27T13:32:39.000+08:00
diff --git a/src/api/nw_screen_api.cc b/src/api/nw_screen_api.cc
@@ -205,7 +205,10 @@ namespace extensions {
     webrtc::DesktopCaptureOptions options = webrtc::DesktopCaptureOptions::CreateDefault();
     options.set_disable_effects(false);
 
-    media_list_.reset(new NativeDesktopMediaList(content::DesktopMediaID::TYPE_SCREEN, webrtc::DesktopCapturer::CreateScreenCapturer(options)));
+    if (screens)
+      media_list_.reset(new NativeDesktopMediaList(content::DesktopMediaID::TYPE_SCREEN, webrtc::DesktopCapturer::CreateScreenCapturer(options)));
+    else if (windows)
+      media_list_.reset(new NativeDesktopMediaList(content::DesktopMediaID::TYPE_WINDOW, webrtc::DesktopCapturer::CreateWindowCapturer(options)));
 
     media_list_->StartUpdating(this);
   }
diff --git a/test/sanity/screen-desktopcapturemonitor/index.html b/test/sanity/screen-desktopcapturemonitor/index.html
@@ -23,7 +23,7 @@
           writeSuccess(eventName);
         })
       });
-      nw.Screen.DesktopCaptureMonitor.start(true, true);
+      nw.Screen.DesktopCaptureMonitor.start(false, true);
     } catch(e) {
       writeFailure(e);
     }
@@ -57,4 +57,4 @@
   }
   </script>
 </body>
-</html>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`writeSuccess(eventName);`
`24`	`24`	`})`
`25`	`25`	`});`
`26`		`- nw.Screen.DesktopCaptureMonitor.start(true, true);`
	`26`	`+ nw.Screen.DesktopCaptureMonitor.start(false, true);`
`27`	`27`	`} catch(e) {`
`28`	`28`	`writeFailure(e);`
`29`	`29`	`}`
`@@ -57,4 +57,4 @@`
`57`	`57`	`}`
`58`	`58`	`</script>`
`59`	`59`	`</body>`
`60`		`-</html>`
	`60`	`+</html>`