Bug 1036653 - changes to webrtcUI to support applications
authorMatthew A. Miller <linuxwolf@outer-planes.net>
Tue, 19 Aug 2014 13:05:39 -0600
changeset 223588 d7b776d3b254f453bbf6207b262e3c1a5810b367
parent 223587 9287adaf50e322b2577dbb43e34a9d97906d9cb9
child 223589 2e423269080410b86277eca11bf5239c842550d1
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1036653
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1036653 - changes to webrtcUI to support applications
browser/modules/webrtcUI.jsm
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@@ -344,17 +344,19 @@ function prompt(aContentWindow, aCallID,
                             i, "Screen");
             break;
           }
         }
 
         // Finally add all the window names.
         let separatorNeeded = true;
         for (let i = 0; i < devices.length; ++i) {
-          if (devices[i].mediaSource == "window") {
+          // treat window and application as the same for UI purposes
+          let deviceMediaSource = devices[i].mediaSource;
+          if (deviceMediaSource == "window" || deviceMediaSource == "application") {
             if (separatorNeeded) {
               menupopup.appendChild(chromeDoc.createElement("menuseparator"));
               separatorNeeded = false;
             }
             addDeviceToList(menupopup, devices[i].name, i, "Window");
           }
         }