aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/EphyHeaderSniffer.h
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla/EphyHeaderSniffer.h')
-rw-r--r--embed/mozilla/EphyHeaderSniffer.h38
1 files changed, 17 insertions, 21 deletions
diff --git a/embed/mozilla/EphyHeaderSniffer.h b/embed/mozilla/EphyHeaderSniffer.h
index 1b8a53979..d0cc9fff9 100644
--- a/embed/mozilla/EphyHeaderSniffer.h
+++ b/embed/mozilla/EphyHeaderSniffer.h
@@ -39,29 +39,26 @@
* $Id$
*/
-#include "mozilla-embed-persist.h"
-#include "ephy-embed-single.h"
+#ifndef EPHY_HEADER_SNIFFER_H
+#define EPHY_HEADER_SNIFFER_H
-#include <nsIWebProgressListener.h>
-#include <nsIWebBrowserPersist.h>
-#include <nsIURI.h>
-#include <nsILocalFile.h>
-#include <nsIInputStream.h>
-#include <nsIDOMDocument.h>
-#include <nsIAuthPrompt.h>
-#include <nsIPromptService.h>
-#undef MOZILLA_INTERNAL_API
-#include <nsEmbedString.h>
-#define MOZILLA_INTERNAL_API 1
+class nsIDOMDocument;
+class nsIFile;
+class nsIInputStream;
+class nsILocalFile;
+class nsIURI;
+class nsIWebBrowserPersist;
-#ifdef HAVE_GECKO_1_8
+#include <nsCOMPtr.h>
+#include <nsIAuthPrompt.h>
#include <nsIInterfaceRequestor.h>
-#endif
+#include <nsIWebProgressListener.h>
+
+#include "mozilla-embed-persist.h"
+#include "ephy-embed-single.h"
class EphyHeaderSniffer : public nsIWebProgressListener,
-#ifdef HAVE_GECKO_1_8
public nsIInterfaceRequestor,
-#endif
public nsIAuthPrompt
{
public:
@@ -73,9 +70,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER
NS_FORWARD_SAFE_NSIAUTHPROMPT(mAuthPrompt)
-#ifdef HAVE_GECKO_1_8
NS_DECL_NSIINTERFACEREQUESTOR
-#endif
nsresult InitiateDownload (nsILocalFile *aDestFile);
@@ -92,8 +87,9 @@ private:
nsCOMPtr<nsIURI> mOriginalURI;
nsCOMPtr<nsIDOMDocument> mDocument;
nsCOMPtr<nsIInputStream> mPostData;
- nsEmbedCString mContentType;
- nsEmbedCString mContentDisposition;
+ nsCString mContentType;
+ nsCString mContentDisposition;
nsCOMPtr<nsIAuthPrompt> mAuthPrompt;
};
+#endif /* !EPHY_HEADER_SNIFFER_H */