bug 404726: Addon compatibility check gives many alerts (xpinstall part). r+sr=dveditz

This commit is contained in:
dtownsend@oxymoronical.com 2008-02-07 03:54:05 -08:00
parent 3b73b8a2a7
commit 84c5fe6f37
2 changed files with 29 additions and 11 deletions

View File

@ -117,17 +117,22 @@ nsXPInstallManager::~nsXPInstallManager()
}
NS_IMPL_THREADSAFE_ISUPPORTS10(nsXPInstallManager,
nsIXPIDialogService,
nsIXPInstallManager,
nsIObserver,
nsIStreamListener,
nsIProgressEventSink,
nsIInterfaceRequestor,
nsPICertNotification,
nsIBadCertListener2,
nsIChannelEventSink,
nsISupportsWeakReference)
NS_INTERFACE_MAP_BEGIN(nsXPInstallManager)
NS_INTERFACE_MAP_ENTRY(nsIXPIDialogService)
NS_INTERFACE_MAP_ENTRY(nsIXPInstallManager)
NS_INTERFACE_MAP_ENTRY(nsIObserver)
NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
NS_INTERFACE_MAP_ENTRY(nsIProgressEventSink)
NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
NS_INTERFACE_MAP_ENTRY(nsPICertNotification)
NS_INTERFACE_MAP_ENTRY(nsIBadCertListener2)
NS_INTERFACE_MAP_ENTRY(nsISSLErrorListener)
NS_INTERFACE_MAP_ENTRY(nsIChannelEventSink)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISupportsWeakReference)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(nsXPInstallManager)
NS_IMPL_RELEASE(nsXPInstallManager)
NS_IMETHODIMP
nsXPInstallManager::InitManagerFromChrome(const PRUnichar **aURLs,
@ -1308,6 +1313,16 @@ nsXPInstallManager::NotifyCertProblem(nsIInterfaceRequestor *socketInfo,
return NS_OK;
}
// nsISSLErrorListener methods
NS_IMETHODIMP
nsXPInstallManager::NotifySSLError(nsIInterfaceRequestor *socketInfo,
PRInt32 error,
const nsACString &targetSite,
PRBool *_retval)
{
*_retval = PR_TRUE;
return NS_OK;
}
NS_IMETHODIMP
nsXPInstallManager::OnCertAvailable(nsIURI *aURI,

View File

@ -57,6 +57,7 @@
#include "nsIDOMWindowInternal.h"
#include "nsIObserver.h"
#include "nsIBadCertListener2.h"
#include "nsISSLErrorListener.h"
#include "nsIChannelEventSink.h"
#include "nsIZipReader.h"
#include "nsIXPIInstallInfo.h"
@ -85,6 +86,7 @@ class nsXPInstallManager : public nsIXPIDialogService,
public nsIInterfaceRequestor,
public nsPICertNotification,
public nsIBadCertListener2,
public nsISSLErrorListener,
public nsIChannelEventSink,
public nsSupportsWeakReference
{
@ -102,6 +104,7 @@ class nsXPInstallManager : public nsIXPIDialogService,
NS_DECL_NSIINTERFACEREQUESTOR
NS_DECL_NSPICERTNOTIFICATION
NS_DECL_NSIBADCERTLISTENER2
NS_DECL_NSISSLERRORLISTENER
NS_DECL_NSICHANNELEVENTSINK
NS_IMETHOD InitManager(nsIDOMWindowInternal* aParentWindow, nsXPITriggerInfo* aTrigger, PRUint32 aChromeType );