Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 922633 - use Services.jsm more in PermissionPromptHelper.jsm; r=smaug

Browse Source
This commit is contained in:
Nathan Froyd 2013-09-30 16:05:21 -04:00
parent 313292b57f
commit 75a83d636a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/permission/PermissionPromptHelper.jsm
View File

@ -45,8 +45,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "permissionPromptService",
"@mozilla.org/permission-prompt-service;1", "@mozilla.org/permission-prompt-service;1",
"nsIPermissionPromptService"); "nsIPermissionPromptService");
let permissionManager = Cc["@mozilla.org/permissionmanager;1"].getService(Ci.nsIPermissionManager);
let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
let appsService = Cc["@mozilla.org/AppsService;1"].getService(Ci.nsIAppsService); let appsService = Cc["@mozilla.org/AppsService;1"].getService(Ci.nsIAppsService);
this.PermissionPromptHelper = { this.PermissionPromptHelper = {
@ -66,10 +64,10 @@ this.PermissionPromptHelper = {
let uri = Services.io.newURI(msg.origin, null, null); let uri = Services.io.newURI(msg.origin, null, null);
let principal = let principal =
secMan.getAppCodebasePrincipal(uri, msg.appID, msg.browserFlag); Services.scriptSecurityManager.getAppCodebasePrincipal(uri, msg.appID, msg.browserFlag);
let permValue = let permValue =
permissionManager.testExactPermissionFromPrincipal(principal, access); Services.perms.testExactPermissionFromPrincipal(principal, access);
if (permValue == Ci.nsIPermissionManager.DENY_ACTION || if (permValue == Ci.nsIPermissionManager.DENY_ACTION ||
permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) { permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {