diff options
Diffstat (limited to 'embed/mozilla/EphyContentPolicy.cpp')
| -rw-r--r-- | embed/mozilla/EphyContentPolicy.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp index 8654afe38..65b26b05b 100644 --- a/embed/mozilla/EphyContentPolicy.cpp +++ b/embed/mozilla/EphyContentPolicy.cpp @@ -27,8 +27,6 @@ #include "EphyContentPolicy.h" -#include "mozilla-version.h" - #include "eel-gconf-extensions.h" #include "ephy-debug.h" @@ -61,16 +59,12 @@ EphyContentPolicy::~EphyContentPolicy() g_slist_free (mSafeProtocols); } -#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) +#ifdef MOZ_NSICONTENTPOLICY_VARIANT_2 NS_IMETHODIMP EphyContentPolicy::ShouldLoad(PRUint32 aContentType, nsIURI *aContentLocation, nsIURI *aRequestingLocation, -#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) nsISupports *aContext, -#else - nsIDOMNode *aRequestingNode, -#endif const nsACString &aMimeTypeGuess, nsISupports *aExtra, PRInt16 *aDecision) @@ -109,11 +103,7 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRUint32 aContentType, nsIURI *aContentLocation, nsIURI *aRequestingLocation, -#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3) nsISupports *aContext, -#else - nsIDOMNode *aRequestingNode, -#endif const nsACString &aMimeType, nsISupports *aExtra, PRInt16 *aDecision) @@ -168,4 +158,4 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType, *_retval = PR_TRUE; return NS_OK; } -#endif /* MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) */ +#endif /* MOZ_NSICONTENTPOLICY_VARIANT_2 || MOZ_NSICONTENTPOLICY_VARIANT_3 */ |