Bug 1049087 - Pre-populate the whitelist for screensharing in Fx33. r=jesup, a=sledru
authorEthan Hugg <ethanhugg@gmail.com>
Thu, 04 Sep 2014 13:13:25 -0700
changeset 224976 e6bf3fa80963d7d1c016f41410fe784ac91e5dcb
parent 224975 32c3c24b52d2f91877b2fd2df7901a3dbd3a7ecd
child 224977 8f2b6a4a26a4f3b8ebd007ba219362d15cb428ae
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)
reviewersjesup, sledru
bugs1049087
milestone34.0a2
Bug 1049087 - Pre-populate the whitelist for screensharing in Fx33. r=jesup, a=sledru
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -375,20 +375,20 @@ pref("media.getusermedia.playout_delay",
 #endif
 #endif
 
 #if !defined(ANDROID)
 pref("media.getusermedia.screensharing.enabled", true);
 #endif
 
 #ifdef RELEASE_BUILD
-pref("media.getusermedia.screensharing.allowed_domains", "");
+pref("media.getusermedia.screensharing.allowed_domains", "webex.com,*.webex.com,collaborate.com,*.collaborate.com");
 #else
  // temporary value, not intended for release - bug 1049087
-pref("media.getusermedia.screensharing.allowed_domains", "mozilla.github.io");
+pref("media.getusermedia.screensharing.allowed_domains", "mozilla.github.io,webex.com,*.webex.com,collaborate.com,*.collaborate.com");
 #endif
 // OS/X 10.6 and XP have screen/window sharing off by default due to various issues - Caveat emptor
 pref("media.getusermedia.screensharing.allow_on_old_platforms", false);
 
 // TextTrack support
 pref("media.webvtt.enabled", true);
 pref("media.webvtt.regions.enabled", false);