From 3505933119a09c001bfb1f3d54c189cc765c5ed2 Mon Sep 17 00:00:00 2001 From: "bryner%uiuc.edu" Date: Thu, 1 Feb 2001 03:25:48 +0000 Subject: [PATCH] Make pipnss's version of nsSecureBrowserUIImpl support weak refs, as was already done to psm-glue. r=thayes. --- security/manager/ssl/src/nsSecureBrowserUIImpl.cpp | 14 ++++---------- security/manager/ssl/src/nsSecureBrowserUIImpl.h | 4 +++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp b/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp index 452bcef7f6d0..234b2103c570 100644 --- a/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp +++ b/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp @@ -27,6 +27,7 @@ #include "nspr.h" #include "prlog.h" +#include "prmem.h" #include "nsISecureBrowserUI.h" #include "nsSecureBrowserUIImpl.h" @@ -34,7 +35,6 @@ #include "nsCOMPtr.h" #include "nsIInterfaceRequestor.h" #include "nsIServiceManager.h" - #include "nsIScriptGlobalObject.h" #include "nsIObserverService.h" #include "nsIDocumentLoader.h" @@ -51,17 +51,10 @@ #include "nsIWebProgress.h" #include "nsIChannel.h" #include "nsIChannelSecurityInfo.h" - #include "nsIURI.h" - -#include "prmem.h" - #include "nsISecurityEventSink.h" - -#include "nsINetSupportDialogService.h" #include "nsIPrompt.h" #include "nsIPref.h" - #include "nsIFormSubmitObserver.h" static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -104,11 +97,12 @@ nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl() { } -NS_IMPL_ISUPPORTS4(nsSecureBrowserUIImpl, +NS_IMPL_ISUPPORTS5(nsSecureBrowserUIImpl, nsSecureBrowserUI, nsIWebProgressListener, nsIFormSubmitObserver, - nsIObserver); + nsIObserver, + nsISupportsWeakReference); NS_IMETHODIMP diff --git a/security/manager/ssl/src/nsSecureBrowserUIImpl.h b/security/manager/ssl/src/nsSecureBrowserUIImpl.h index 8efc5de1af0d..623cff392d6b 100644 --- a/security/manager/ssl/src/nsSecureBrowserUIImpl.h +++ b/security/manager/ssl/src/nsSecureBrowserUIImpl.h @@ -41,6 +41,7 @@ #include "nsIFormSubmitObserver.h" #include "nsIURI.h" #include "nsISecurityEventSink.h" +#include "nsWeakReference.h" #define NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME "Mozilla Secure Browser Doc Observer" @@ -54,7 +55,8 @@ class nsSecureBrowserUIImpl : public nsSecureBrowserUI, public nsIWebProgressListener, public nsIFormSubmitObserver, - public nsIObserver + public nsIObserver, + public nsSupportsWeakReference { public: