Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include URI in notification of permission change. bug 166442 r=brendan,jag

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130668 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com 2002-09-28 16:00:13 +00:00
parent 95e2ce3116
commit 84e94643dd
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/extensions/cookie/nsPopupWindowManager.cpp
View File

@ -56,12 +56,12 @@
#define POLICYSTRING "policy" #define POLICYSTRING "policy"
#define CUSTOMSTRING "usecustom" #define CUSTOMSTRING "usecustom"
static const char *sPopupPrefRoot = "privacy.popups."; static const char sPopupPrefRoot[] = "privacy.popups.";
static const char *sPopupPrefPolicyLeaf = POLICYSTRING; static const char sPopupPrefPolicyLeaf[] = POLICYSTRING;
static const char *sPopupPrefCustomLeaf = CUSTOMSTRING; static const char sPopupPrefCustomLeaf[] = CUSTOMSTRING;
static const char *sPermissionChangeNotification = PPM_CHANGE_NOTIFICATION; static const char sPermissionChangeNotification[] = PPM_CHANGE_NOTIFICATION;
static const char *sXPCOMShutdownTopic = NS_XPCOM_SHUTDOWN_OBSERVER_ID; static const char sXPCOMShutdownTopic[] = NS_XPCOM_SHUTDOWN_OBSERVER_ID;
static const char *sPrefChangedTopic = NS_PREFBRANCH_PREFCHANGE_TOPIC_ID; static const char sPrefChangedTopic[] = NS_PREFBRANCH_PREFCHANGE_TOPIC_ID;
//***************************************************************************** //*****************************************************************************
//*** nsPopupWindowManager object management and nsISupports //*** nsPopupWindowManager object management and nsISupports
@ -133,7 +133,7 @@ nsPopupWindowManager::Add(nsIURI *aURI, PRBool aPermit)
nsCAutoString uri; nsCAutoString uri;
aURI->GetPrePath(uri); aURI->GetPrePath(uri);
if (NS_SUCCEEDED(mPermManager->Add(uri, aPermit, WINDOWPERMISSION))) if (NS_SUCCEEDED(mPermManager->Add(uri, aPermit, WINDOWPERMISSION)))
return NotifyObservers(); return NotifyObservers(aURI);
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@ -147,7 +147,7 @@ nsPopupWindowManager::Remove(nsIURI *aURI)
nsCAutoString uri; nsCAutoString uri;
aURI->GetPrePath(uri); aURI->GetPrePath(uri);
if (NS_SUCCEEDED(mPermManager->Add(uri, PR_TRUE, WINDOWPERMISSION))) if (NS_SUCCEEDED(mPermManager->Add(uri, PR_TRUE, WINDOWPERMISSION)))
return NotifyObservers(); return NotifyObservers(aURI);
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@ -296,11 +296,14 @@ nsPopupWindowManager::StopObservingThings()
// broadcast a notification that a popup pref has changed // broadcast a notification that a popup pref has changed
nsresult nsresult
nsPopupWindowManager::NotifyObservers() nsPopupWindowManager::NotifyObservers(nsIURI *aURI)
{ {
if (mOS) if (mOS) {
nsCAutoString uri;
aURI->GetSpec(uri);
return mOS->NotifyObservers(NS_STATIC_CAST(nsIPopupWindowManager *, this), return mOS->NotifyObservers(NS_STATIC_CAST(nsIPopupWindowManager *, this),
sPermissionChangeNotification, 0); sPermissionChangeNotification, NS_ConvertUTF8toUCS2(uri).get());
}
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }

4
mozilla/extensions/cookie/nsPopupWindowManager.h
View File

@ -46,6 +46,8 @@
#include "nsIPopupWindowManager.h" #include "nsIPopupWindowManager.h"
#include "nsIPrefBranch.h" #include "nsIPrefBranch.h"
class nsIURI;
class nsPopupWindowManager : public nsIPopupWindowManager, class nsPopupWindowManager : public nsIPopupWindowManager,
public nsIObserver { public nsIObserver {
@ -61,7 +63,7 @@ public:
private: private:
nsresult ObserveThings(); nsresult ObserveThings();
nsresult StopObservingThings(); nsresult StopObservingThings();
nsresult NotifyObservers(); nsresult NotifyObservers(nsIURI *aURI);
void DeInitialize(); void DeInitialize();
PRUint32 mPolicy; PRUint32 mPolicy;