From 75a83d636ac6c8f048493025aaaaff7fdc59c17f Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Mon, 30 Sep 2013 16:05:21 -0400 Subject: [PATCH] Bug 922633 - use Services.jsm more in PermissionPromptHelper.jsm; r=smaug --- dom/permission/PermissionPromptHelper.jsm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dom/permission/PermissionPromptHelper.jsm b/dom/permission/PermissionPromptHelper.jsm index 6f0d7292426d..59527830dd63 100644 --- a/dom/permission/PermissionPromptHelper.jsm +++ b/dom/permission/PermissionPromptHelper.jsm @@ -45,8 +45,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "permissionPromptService", "@mozilla.org/permission-prompt-service;1", "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); this.PermissionPromptHelper = { @@ -66,10 +64,10 @@ this.PermissionPromptHelper = { let uri = Services.io.newURI(msg.origin, null, null); let principal = - secMan.getAppCodebasePrincipal(uri, msg.appID, msg.browserFlag); + Services.scriptSecurityManager.getAppCodebasePrincipal(uri, msg.appID, msg.browserFlag); let permValue = - permissionManager.testExactPermissionFromPrincipal(principal, access); + Services.perms.testExactPermissionFromPrincipal(principal, access); if (permValue == Ci.nsIPermissionManager.DENY_ACTION || permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {