diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
| commit | b774b547788b74884b9eb690c548a6016e714023 (patch) | |
| tree | 72b9df09c0fc257169b3e9b9cbdc349e56a63101 /embed/mozilla/MozDownload.h | |
| parent | b699b40d663955560655271f7645ae277e6076c8 (diff) | |
| download | gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.bz2 gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.lz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.xz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.zst gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.zip | |
merge mozilla-embed-strings branch
Diffstat (limited to 'embed/mozilla/MozDownload.h')
| -rw-r--r-- | embed/mozilla/MozDownload.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/embed/mozilla/MozDownload.h b/embed/mozilla/MozDownload.h index 2f4042868..ed01d248e 100644 --- a/embed/mozilla/MozDownload.h +++ b/embed/mozilla/MozDownload.h @@ -61,10 +61,6 @@ #include <nsIRequest.h> #include <nsIMIMEInfo.h> -#ifdef ALLOW_PRIVATE_API -#include <nsString.h> -#endif - #include <libgnomevfs/gnome-vfs-mime-handlers.h> /* MozDownload @@ -103,9 +99,7 @@ public: virtual ~MozDownload(); NS_DECL_ISUPPORTS -#if MOZILLA_SNAPSHOT > 15 NS_DECL_NSITRANSFER -#endif NS_DECL_NSIDOWNLOAD NS_DECL_NSIWEBPROGRESSLISTENER @@ -117,25 +111,15 @@ public: nsresult GetCurrentProgress (PRInt32 *aCurrentProgress); nsresult GetTotalProgress (PRInt32 *aTProgress); nsresult GetElapsedTime (PRInt64 *aTProgress); -#if MOZILLA_SNAPSHOT < 16 - nsresult InitForEmbed (nsIURI *aSource, nsILocalFile *aTarget, - const PRUnichar *aDisplayName, nsIMIMEInfo *aMIMEInfo, - PRInt64 startTime, nsIWebBrowserPersist *aPersist, - MozillaEmbedPersist *aEmbedPersist, PRInt32 aMaxSize); -#else nsresult InitForEmbed (nsIURI *aSource, nsIURI *aTarget, const PRUnichar *aDisplayName, nsIMIMEInfo *aMIMEInfo, PRInt64 startTime, nsIWebBrowserPersist *aPersist, MozillaEmbedPersist *aEmbedPersist, PRInt32 aMaxSize); -#endif protected: nsCOMPtr<nsIURI> mSource; -#if MOZILLA_SNAPSHOT < 16 - nsCOMPtr<nsILocalFile> mDestination; -#else nsCOMPtr<nsIURI> mDestination; -#endif + nsCOMPtr<nsIMIMEInfo> mMIMEInfo; PRInt64 mLastUpdate; PRInt64 mStartTime; |