Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 21:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1003312 - make PermissionSettings.js{,m} use Services.jsm more; r=fabrice

Browse Source
This commit is contained in:
Nathan Froyd 2014-04-29 13:27:51 -04:00
parent 84041459a1
commit 5340877d74
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/permission/PermissionSettings.js
View File

@ -28,16 +28,6 @@ function PermissionSettings()
debug("Constructor"); debug("Constructor");
} }
XPCOMUtils.defineLazyServiceGetter(this,
"permissionManager",
"@mozilla.org/permissionmanager;1",
"nsIPermissionManager");
XPCOMUtils.defineLazyServiceGetter(this,
"secMan",
"@mozilla.org/scriptsecuritymanager;1",
"nsIScriptSecurityManager");
XPCOMUtils.defineLazyServiceGetter(this, XPCOMUtils.defineLazyServiceGetter(this,
"appsService", "appsService",
"@mozilla.org/AppsService;1", "@mozilla.org/AppsService;1",
@ -48,8 +38,8 @@ PermissionSettings.prototype = {
debug("Get called with: " + aPermName + ", " + aManifestURL + ", " + aOrigin + ", " + aBrowserFlag); debug("Get called with: " + aPermName + ", " + aManifestURL + ", " + aOrigin + ", " + aBrowserFlag);
let uri = Services.io.newURI(aOrigin, null, null); let uri = Services.io.newURI(aOrigin, null, null);
let appID = appsService.getAppLocalIdByManifestURL(aManifestURL); let appID = appsService.getAppLocalIdByManifestURL(aManifestURL);
let principal = secMan.getAppCodebasePrincipal(uri, appID, aBrowserFlag); let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(uri, appID, aBrowserFlag);
let result = permissionManager.testExactPermanentPermission(principal, aPermName); let result = Services.perms.testExactPermanentPermission(principal, aPermName);
switch (result) switch (result)
{ {
@ -72,7 +62,7 @@ PermissionSettings.prototype = {
debug("isExplicit: " + aPermName + ", " + aManifestURL + ", " + aOrigin); debug("isExplicit: " + aPermName + ", " + aManifestURL + ", " + aOrigin);
let uri = Services.io.newURI(aOrigin, null, null); let uri = Services.io.newURI(aOrigin, null, null);
let appID = appsService.getAppLocalIdByManifestURL(aManifestURL); let appID = appsService.getAppLocalIdByManifestURL(aManifestURL);
let principal = secMan.getAppCodebasePrincipal(uri, appID, aBrowserFlag); let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(uri, appID, aBrowserFlag);
return isExplicitInPermissionsTable(aPermName, principal.appStatus); return isExplicitInPermissionsTable(aPermName, principal.appStatus);
}, },
@ -108,7 +98,7 @@ PermissionSettings.prototype = {
remove: function remove(aPermName, aManifestURL, aOrigin) { remove: function remove(aPermName, aManifestURL, aOrigin) {
let uri = Services.io.newURI(aOrigin, null, null); let uri = Services.io.newURI(aOrigin, null, null);
let appID = appsService.getAppLocalIdByManifestURL(aManifestURL); let appID = appsService.getAppLocalIdByManifestURL(aManifestURL);
let principal = secMan.getAppCodebasePrincipal(uri, appID, true); let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(uri, appID, true);
if (principal.appStatus !== Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { if (principal.appStatus !== Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) {
let errorMsg = "PermissionSettings.js: '" + aOrigin + "'" + let errorMsg = "PermissionSettings.js: '" + aOrigin + "'" +

20
dom/permission/PermissionSettings.jsm
View File

@ -22,16 +22,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
"@mozilla.org/parentprocessmessagemanager;1", "@mozilla.org/parentprocessmessagemanager;1",
"nsIMessageListenerManager"); "nsIMessageListenerManager");
XPCOMUtils.defineLazyServiceGetter(this,
"permissionManager",
"@mozilla.org/permissionmanager;1",
"nsIPermissionManager");
XPCOMUtils.defineLazyServiceGetter(this,
"secMan",
"@mozilla.org/scriptsecuritymanager;1",
"nsIScriptSecurityManager");
XPCOMUtils.defineLazyServiceGetter(this, XPCOMUtils.defineLazyServiceGetter(this,
"appsService", "appsService",
"@mozilla.org/AppsService;1", "@mozilla.org/AppsService;1",
@ -59,7 +49,7 @@ this.PermissionSettingsModule = {
// if the permission is actually explicit (and thus modifiable) or not // if the permission is actually explicit (and thus modifiable) or not
// on permissionManager also but we currently don't. // on permissionManager also but we currently don't.
let perm = let perm =
permissionManager.testExactPermissionFromPrincipal(aPrincipal,aPermName); Services.perms.testExactPermissionFromPrincipal(aPrincipal,aPermName);
let isExplicit = isExplicitInPermissionsTable(aPermName, aPrincipal.appStatus); let isExplicit = isExplicitInPermissionsTable(aPermName, aPrincipal.appStatus);
return (aAction === "unknown" && return (aAction === "unknown" &&
@ -79,7 +69,7 @@ this.PermissionSettingsModule = {
_internalAddPermission: function _internalAddPermission(aData, aAllowAllChanges, aCallbacks) { _internalAddPermission: function _internalAddPermission(aData, aAllowAllChanges, aCallbacks) {
let uri = Services.io.newURI(aData.origin, null, null); let uri = Services.io.newURI(aData.origin, null, null);
let appID = appsService.getAppLocalIdByManifestURL(aData.manifestURL); let appID = appsService.getAppLocalIdByManifestURL(aData.manifestURL);
let principal = secMan.getAppCodebasePrincipal(uri, appID, aData.browserFlag); let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(uri, appID, aData.browserFlag);
let action; let action;
switch (aData.value) switch (aData.value)
@ -104,7 +94,7 @@ this.PermissionSettingsModule = {
if (aAllowAllChanges || if (aAllowAllChanges ||
this._isChangeAllowed(principal, aData.type, aData.value)) { this._isChangeAllowed(principal, aData.type, aData.value)) {
debug("add: " + aData.origin + " " + appID + " " + action); debug("add: " + aData.origin + " " + appID + " " + action);
permissionManager.addFromPrincipal(principal, aData.type, action); Services.perms.addFromPrincipal(principal, aData.type, action);
return true; return true;
} else { } else {
debug("add Failure: " + aData.origin + " " + appID + " " + action); debug("add Failure: " + aData.origin + " " + appID + " " + action);
@ -116,8 +106,8 @@ this.PermissionSettingsModule = {
debug("getPermission: " + aPermName + ", " + aManifestURL + ", " + aOrigin); debug("getPermission: " + aPermName + ", " + aManifestURL + ", " + aOrigin);
let uri = Services.io.newURI(aOrigin, null, null); let uri = Services.io.newURI(aOrigin, null, null);
let appID = appsService.getAppLocalIdByManifestURL(aManifestURL); let appID = appsService.getAppLocalIdByManifestURL(aManifestURL);
let principal = secMan.getAppCodebasePrincipal(uri, appID, aBrowserFlag); let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(uri, appID, aBrowserFlag);
let result = permissionManager.testExactPermissionFromPrincipal(principal, aPermName); let result = Services.perms.testExactPermissionFromPrincipal(principal, aPermName);
switch (result) switch (result)
{ {