diff --git a/mozilla/extensions/cookie/nsPopupWindowManager.cpp b/mozilla/extensions/cookie/nsPopupWindowManager.cpp index 69791dff21d..1a9d3e5ee6e 100644 --- a/mozilla/extensions/cookie/nsPopupWindowManager.cpp +++ b/mozilla/extensions/cookie/nsPopupWindowManager.cpp @@ -68,7 +68,7 @@ static const char sPrefChangedTopic[] = NS_PREFBRANCH_PREFCHANGE_TOPIC_ID; //***************************************************************************** nsPopupWindowManager::nsPopupWindowManager() : - mPolicy(eAllow), + mPolicy(ALLOW_POPUP), mCustomPermissions(PR_FALSE) { NS_INIT_ISUPPORTS(); @@ -110,14 +110,14 @@ nsPopupWindowManager::Init() NS_IMETHODIMP nsPopupWindowManager::GetDefaultPermission(PRUint32 *aDefaultPermission) { - return eAllow; + return ALLOW_POPUP; } NS_IMETHODIMP nsPopupWindowManager::SetDefaultPermission(PRUint32 aDefaultPermission) { - NS_ASSERTION(aDefaultPermission == eAllow, "whitelist not supported"); - return aDefaultPermission == eAllow ? NS_OK : NS_ERROR_FAILURE; + NS_ASSERTION(aDefaultPermission == ALLOW_POPUP, "whitelist not supported"); + return aDefaultPermission == ALLOW_POPUP ? NS_OK : NS_ERROR_FAILURE; } /* Note: since we don't support whitelists, Add(uri, true) is the same thing @@ -180,7 +180,7 @@ nsPopupWindowManager::TestPermission(nsIURI *aURI, PRUint32 *_retval) *_retval = mPolicy; - if (mPolicy == eAllow && mCustomPermissions) { + if (mPolicy == ALLOW_POPUP && mCustomPermissions) { if (mPermManager) { /* Because of a bug/quirk/something in the PermissionManager the value of blockDomain will be left unchanged if the URI @@ -193,7 +193,7 @@ nsPopupWindowManager::TestPermission(nsIURI *aURI, PRUint32 *_retval) nsCAutoString uri; aURI->GetPrePath(uri); mPermManager->TestForBlocking(uri, WINDOWPERMISSION, &blockDomain); - *_retval = blockDomain ? eDisallow : eAllowConditionally; + *_retval = blockDomain ? DENY_POPUP : ALLOW_POPUP_WITH_PREJUDICE; } } return NS_OK; @@ -235,7 +235,7 @@ nsPopupWindowManager::Observe(nsISupports *aSubject, const char *aTopic, (NS_LITERAL_STRING(POLICYSTRING).Equals(aData) || NS_LITERAL_STRING(CUSTOMSTRING).Equals(aData))) { // refresh our local copy of the "allow popups" pref - PRInt32 perm = eAllow; + PRInt32 perm = ALLOW_POPUP; PRBool custom = PR_FALSE; if (mPopupPrefBranch) { diff --git a/mozilla/extensions/cookie/resources/content/cookieNavigatorOverlay.xul b/mozilla/extensions/cookie/resources/content/cookieNavigatorOverlay.xul index 03178dc08c8..209d79f4344 100644 --- a/mozilla/extensions/cookie/resources/content/cookieNavigatorOverlay.xul +++ b/mozilla/extensions/cookie/resources/content/cookieNavigatorOverlay.xul @@ -107,14 +107,14 @@ // use care choosing which nsIPopupWindowManager constant to compare // against. the allow/disallow/sometimes relationship can be subtle. var useManager = !pref.getBoolPref("dom.disable_open_during_load") && - pref.getIntPref("privacy.popups.policy") == Components.interfaces.nsIPopupWindowManager.eAllow && + pref.getIntPref("privacy.popups.policy") == Components.interfaces.nsIPopupWindowManager.ALLOW_POPUP && pref.getBoolPref("privacy.popups.usecustom"); var suitable = false; var enableBlock = false; if (useManager) { suitable = popupmanager.testSuitability(getBrowser().currentURI); if (suitable) - enableBlock = popupmanager.testPermission(getBrowser().currentURI) != Components.interfaces.nsIPopupWindowManager.eDisallow; + enableBlock = popupmanager.testPermission(getBrowser().currentURI) != Components.interfaces.nsIPopupWindowManager.DENY_POPUP; } enableElement("BlockPopups", useManager && suitable && enableBlock); enableElement("AllowPopups", useManager && suitable && !enableBlock); diff --git a/mozilla/xpfe/appshell/public/nsIPopupWindowManager.idl b/mozilla/xpfe/appshell/public/nsIPopupWindowManager.idl index 40c4a150c34..4a7d3bb61c5 100644 --- a/mozilla/xpfe/appshell/public/nsIPopupWindowManager.idl +++ b/mozilla/xpfe/appshell/public/nsIPopupWindowManager.idl @@ -52,13 +52,13 @@ interface nsIPopupWindowManager : nsISupports { /** * These values are returned by the testPermission method */ - const PRUint32 eAllow = 1; - const PRUint32 eDisallow = 2; - const PRUint32 eAllowConditionally = 3; + const PRUint32 ALLOW_POPUP = 1; + const PRUint32 DENY_POPUP = 2; + const PRUint32 ALLOW_POPUP_WITH_PREJUDICE = 3; /** - * The manager's default permission can be eAllow (a blacklist) - * or eDisallow (a whitelist). + * The manager's default permission can be ALLOW_POPUP (a blacklist) + * or DENY_POPUP (a whitelist). */ attribute PRUint32 defaultPermission; @@ -93,7 +93,7 @@ interface nsIPopupWindowManager : nsISupports { /** * Test whether a website has permission to show a popup window. * @param aURI the website to be tested - * @return one of the eAllow consts defined above + * @return one of the ALLOW/DENY consts defined above */ PRUint32 testPermission(in nsIURI aURI); @@ -125,5 +125,5 @@ interface nsIPopupWindowManager : nsISupports { { 0x2e14fec9, 0xe8e9, 0x44cc, { 0x8c, 0x86, 0xc8, 0x67, 0x3c, 0x23, 0x83,0xcc }} #define NS_POPUPWINDOWMANAGER_CONTRACTID "@mozilla.org/PopupWindowManager;1" -#define PPM_CHANGE_NOTIFICATION "popup perm change" +#define PPM_CHANGE_NOTIFICATION "popup-perm-change" %} diff --git a/mozilla/xpfe/bootstrap/nsWindowCreator.cpp b/mozilla/xpfe/bootstrap/nsWindowCreator.cpp index 1a412478a30..dfe41745c4d 100644 --- a/mozilla/xpfe/bootstrap/nsWindowCreator.cpp +++ b/mozilla/xpfe/bootstrap/nsWindowCreator.cpp @@ -117,7 +117,7 @@ nsWindowCreator::CreateChromeWindow2(nsIWebBrowserChrome *aParent, NS_ENSURE_ARG_POINTER(_retval); *_retval = 0; - PRUint32 allow = nsIPopupWindowManager::eAllow; + PRUint32 allow = nsIPopupWindowManager::ALLOW_POPUP; nsCOMPtr parentURI; GetParentURI(aParent, getter_AddRefs(parentURI)); @@ -127,9 +127,9 @@ nsWindowCreator::CreateChromeWindow2(nsIWebBrowserChrome *aParent, nsCOMPtr newWindow; if (aParent) { - if (allow == nsIPopupWindowManager::eDisallow) + if (allow == nsIPopupWindowManager::DENY_POPUP) return NS_OK; // ruse to not give scripts a catchable error - if (allow == nsIPopupWindowManager::eAllow && + if (allow == nsIPopupWindowManager::ALLOW_POPUP && (aContextFlags & PARENT_IS_LOADING_OR_RUNNING_TIMEOUT)) aContextFlags &= ~PARENT_IS_LOADING_OR_RUNNING_TIMEOUT; @@ -172,12 +172,12 @@ nsWindowCreator::AllowWindowCreation(nsIURI *aURI) { nsCOMPtr pm(do_GetService(NS_POPUPWINDOWMANAGER_CONTRACTID)); if (!pm) - return nsIPopupWindowManager::eAllow; + return nsIPopupWindowManager::ALLOW_POPUP; PRUint32 permission; if (NS_SUCCEEDED(pm->TestPermission(aURI, &permission))) return permission; - return nsIPopupWindowManager::eAllow; + return nsIPopupWindowManager::ALLOW_POPUP; } void diff --git a/mozilla/xpfe/communicator/resources/content/nsContextMenu.js b/mozilla/xpfe/communicator/resources/content/nsContextMenu.js index 43647efff69..5787cf7ca77 100644 --- a/mozilla/xpfe/communicator/resources/content/nsContextMenu.js +++ b/mozilla/xpfe/communicator/resources/content/nsContextMenu.js @@ -158,7 +158,7 @@ nsContextMenu.prototype = { const PM = Components.classes["@mozilla.org/PopupWindowManager;1"] .getService(Components.interfaces.nsIPopupWindowManager); blocking = PM.testPermission(this.popupURL) == - Components.interfaces.nsIPopupWindowManager.eDisallow; + Components.interfaces.nsIPopupWindowManager.DENY_POPUP; } catch (e) { } @@ -435,7 +435,7 @@ nsContextMenu.prototype = { .getService(CI.nsIPrefBranch); show = !PB.getBoolPref("dom.disable_open_during_load") && PB.getIntPref("privacy.popups.policy") == - CI.nsIPopupWindowManager.eAllow && + CI.nsIPopupWindowManager.ALLOW_POPUP && PB.getBoolPref("privacy.popups.usecustom"); } if (show) { diff --git a/mozilla/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul b/mozilla/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul index 03178dc08c8..209d79f4344 100644 --- a/mozilla/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul +++ b/mozilla/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul @@ -107,14 +107,14 @@ // use care choosing which nsIPopupWindowManager constant to compare // against. the allow/disallow/sometimes relationship can be subtle. var useManager = !pref.getBoolPref("dom.disable_open_during_load") && - pref.getIntPref("privacy.popups.policy") == Components.interfaces.nsIPopupWindowManager.eAllow && + pref.getIntPref("privacy.popups.policy") == Components.interfaces.nsIPopupWindowManager.ALLOW_POPUP && pref.getBoolPref("privacy.popups.usecustom"); var suitable = false; var enableBlock = false; if (useManager) { suitable = popupmanager.testSuitability(getBrowser().currentURI); if (suitable) - enableBlock = popupmanager.testPermission(getBrowser().currentURI) != Components.interfaces.nsIPopupWindowManager.eDisallow; + enableBlock = popupmanager.testPermission(getBrowser().currentURI) != Components.interfaces.nsIPopupWindowManager.DENY_POPUP; } enableElement("BlockPopups", useManager && suitable && enableBlock); enableElement("AllowPopups", useManager && suitable && !enableBlock);