diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 38856dbe6e2..b12c31f4cce 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ - + @@ -211,6 +211,8 @@ + + @@ -282,8 +284,10 @@ - - + + + + diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig index 0b2952c004a..4d80fd3d7b9 100644 --- a/browser/config/mozconfigs/win32/l10n-mozconfig +++ b/browser/config/mozconfigs/win32/l10n-mozconfig @@ -4,6 +4,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-packaging ac_add_options --with-l10n-base=../../l10n-central ac_add_options --enable-metro +ac_add_options --with-windows-version=601 export MOZILLA_OFFICIAL=1 diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm index a5b8e32ad96..77ad442c813 100644 --- a/browser/modules/webrtcUI.jsm +++ b/browser/modules/webrtcUI.jsm @@ -80,15 +80,20 @@ function handleRequest(aSubject, aTopic, aData) { function (error) { // bug 827146 -- In the future, the UI should catch NO_DEVICES_FOUND // and allow the user to plug in a device, instead of immediately failing. - let msg = Cc["@mozilla.org/supports-string;1"]. - createInstance(Ci.nsISupportsString); - msg.data = error; - Services.obs.notifyObservers(msg, "getUserMedia:response:deny", callID); - Cu.reportError(error); + denyRequest(callID, error); } ); } +function denyRequest(aCallID, aError) { + let msg = null; + if (aError) { + msg = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString); + msg.data = aError; + } + Services.obs.notifyObservers(msg, "getUserMedia:response:deny", aCallID); +} + function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) { let audioDevices = []; let videoDevices = []; @@ -113,8 +118,10 @@ function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) { requestType = "Microphone"; else if (videoDevices.length) requestType = "Camera"; - else + else { + denyRequest(aCallID, "NO_DEVICES_FOUND"); return; + } let host = aBrowser.contentDocument.documentURIObject.asciiHost; let chromeDoc = aBrowser.ownerDocument; @@ -173,7 +180,7 @@ function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) { } if (allowedDevices.Count() == 0) { - Services.obs.notifyObservers(null, "getUserMedia:response:deny", aCallID); + denyRequest(aCallID); return; } @@ -197,7 +204,7 @@ function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) { label: stringBundle.getString("getUserMedia.denyRequest.label"), accessKey: stringBundle.getString("getUserMedia.denyRequest.accesskey"), callback: function () { - Services.obs.notifyObservers(null, "getUserMedia:response:deny", aCallID); + denyRequest(aCallID); } }];