change popup manager's IDL constants to JS standard style instead of that silly reverse hungarian nonsense. r=brendan

git-svn-id: svn://10.0.0.236/trunk@130671 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com
2002-09-28 18:01:31 +00:00
parent 7c07044f7a
commit 29406c0471
6 changed files with 25 additions and 25 deletions

View File

@@ -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<nsIURI> parentURI;
GetParentURI(aParent, getter_AddRefs(parentURI));
@@ -127,9 +127,9 @@ nsWindowCreator::CreateChromeWindow2(nsIWebBrowserChrome *aParent,
nsCOMPtr<nsIXULWindow> 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<nsIPopupWindowManager> 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