зеркало из https://github.com/mozilla/gecko-dev.git
bug 746645 - Adding the white-list for myapps (or stage-myapps) has no effect with a clean FF profile; r=fabrice, a=mfinkle
This commit is contained in:
Родитель
6dd2beeefb
Коммит
8931955f8e
|
@ -47,16 +47,14 @@ let DOMApplicationRegistry = {
|
||||||
|
|
||||||
Services.obs.addObserver(this, "xpcom-shutdown", false);
|
Services.obs.addObserver(this, "xpcom-shutdown", false);
|
||||||
|
|
||||||
let appsDir = FileUtils.getDir(DIRECTORY_NAME, ["webapps"], true, true);
|
|
||||||
this.appsFile = FileUtils.getFile(DIRECTORY_NAME, ["webapps", "webapps.json"], true);
|
this.appsFile = FileUtils.getFile(DIRECTORY_NAME, ["webapps", "webapps.json"], true);
|
||||||
|
|
||||||
if (!this.appsFile.exists())
|
if (this.appsFile.exists()) {
|
||||||
return;
|
this._loadJSONAsync(this.appsFile, (function(aData) { this.webapps = aData; }).bind(this));
|
||||||
|
}
|
||||||
this._loadJSONAsync(this.appsFile, (function(aData) { this.webapps = aData; }).bind(this));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let hosts = Services.prefs.getCharPref("dom.mozApps.whitelist")
|
let hosts = Services.prefs.getCharPref("dom.mozApps.whitelist");
|
||||||
hosts.split(",").forEach(function(aHost) {
|
hosts.split(",").forEach(function(aHost) {
|
||||||
Services.perms.add(Services.io.newURI(aHost, null, null), "webapps-manage",
|
Services.perms.add(Services.io.newURI(aHost, null, null), "webapps-manage",
|
||||||
Ci.nsIPermissionManager.ALLOW_ACTION);
|
Ci.nsIPermissionManager.ALLOW_ACTION);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче