Merge branch 'master' into talk-muted

modules/RTC/ScreenObtainer.js

@@ -248,7 +248,7 @@ var ScreenObtainer = {
                         window.setTimeout(function () {
                             doGetStreamFromExtension(self.options,
                                 streamCallback, failCallback);
-                        }, 500);
+                        }, 2000);
                     },
                     this.handleExtensionInstallationError.bind(this,
                         options, streamCallback, failCallback)

modules/statistics/RTPStatsCollector.js

@@ -8,7 +8,8 @@ import * as StatisticsEvents from "../../service/statistics/Events";
 
 /* Whether we support the browser we are running into for logging statistics */
 var browserSupported = RTCBrowserType.isChrome() ||
-        RTCBrowserType.isOpera() || RTCBrowserType.isFirefox();
+        RTCBrowserType.isOpera() || RTCBrowserType.isFirefox() ||
+        RTCBrowserType.isNWJS();
 
 /**
  * The LibJitsiMeet browser-agnostic names of the browser-specific keys reported
@@ -45,6 +46,8 @@ KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_CHROME] = {
 };
 KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_OPERA] =
     KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_CHROME];
+KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_NWJS] =
+    KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_CHROME];
 KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_IEXPLORER] =
     KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_CHROME];
 KEYS_BY_BROWSER_TYPE[RTCBrowserType.RTC_BROWSER_SAFARI] =
@@ -457,6 +460,7 @@ StatsCollector.prototype._defineGetStatValueMethod = function (keys) {
     switch (this._browserType) {
     case RTCBrowserType.RTC_BROWSER_CHROME:
     case RTCBrowserType.RTC_BROWSER_OPERA:
+    case RTCBrowserType.RTC_BROWSER_NWJS:
         // TODO What about other types of browser which are based on Chrome such
         // as NW.js? Every time we want to support a new type browser we have to
         // go and add more conditions (here and in multiple other places).