Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 10:40:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 1024e72d4ef9 (bug 826146) because of test failures

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-01-03 22:59:44 -05:00
parent b66d21436a
commit 350a6e82ba
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/apps/src/Webapps.jsm
View File

@ -1382,14 +1382,8 @@ this.DOMApplicationRegistry = {
sendError("INVALID_SECURITY_LEVEL"); sendError("INVALID_SECURITY_LEVEL");
} else { } else {
app.etag = xhr.getResponseHeader("Etag"); app.etag = xhr.getResponseHeader("Etag");
// We allow bypassing the install confirmation process to facilitate Services.obs.notifyObservers(aMm, "webapps-ask-install",
// automation. JSON.stringify(aData));
if (Services.prefs.getBoolPref("dom.mozApps.auto_confirm_install")) {
this.confirmInstall(aData);
} else {
Services.obs.notifyObservers(aMm, "webapps-ask-install",
JSON.stringify(aData));
}
} }
} else { } else {
sendError("MANIFEST_URL_ERROR"); sendError("MANIFEST_URL_ERROR");

8
testing/specialpowers/content/specialpowersAPI.js
View File

@ -719,14 +719,6 @@ SpecialPowersAPI.prototype = {
} }
}, },
// Disables the app install prompt for the duration of this test. There is
// no need to re-enable the prompt at the end of the test.
//
// The provided callback is invoked once the prompt is disabled.
autoConfirmAppInstall: function(cb) {
this.pushPrefEnv({set: [['dom.mozApps.auto_confirm_install', true]]}, cb);
},
addObserver: function(obs, notification, weak) { addObserver: function(obs, notification, weak) {
var obsvc = Cc['@mozilla.org/observer-service;1'] var obsvc = Cc['@mozilla.org/observer-service;1']
.getService(Ci.nsIObserverService); .getService(Ci.nsIObserverService);