Bug 902899 - Fix ContentPermission Prompt. r=etienne

This commit is contained in:
Gregor Wagner 2013-08-09 19:02:33 +02:00
parent e0ee8135f5
commit ff45489941
2 changed files with 7 additions and 2 deletions

View File

@ -791,6 +791,7 @@ var AlertsHelper = {
if (!manifestUrl || !manifestUrl.length) {
send(null, null);
return;
}
// If we have a manifest URL, get the icon and title from the manifest

View File

@ -188,7 +188,9 @@ ContentPermissionPrompt.prototype = {
this.sendToBrowserWindow("permission-prompt", request, requestId, function(type, remember) {
if (type == "permission-allow") {
rememberPermission(request.type, principal, !remember);
callback();
if (callback) {
callback();
}
request.allow();
return;
}
@ -202,7 +204,9 @@ ContentPermissionPrompt.prototype = {
Ci.nsIPermissionManager.EXPIRE_SESSION, 0);
}
callback();
if (callback) {
callback();
}
request.cancel();
});
},