diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-05-07 21:32:54 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-05-07 21:32:54 +0800 |
| commit | bb74728ca89c5fefd999f86960c9a16db0e7e5c9 (patch) | |
| tree | b9708e6ee104340ff5ec123ae205d221fe5fa82a /embed/mozilla/MozDownload.h | |
| parent | 0dcd33eacecfaa7c83f420e2c1eeda13fa7939e5 (diff) | |
| download | gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.tar gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.tar.gz gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.tar.bz2 gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.tar.lz gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.tar.xz gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.tar.zst gsoc2013-epiphany-bb74728ca89c5fefd999f86960c9a16db0e7e5c9.zip | |
Merged nsIDownload API changes from HEAD.
2004-05-07 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* embed/mozilla/EventContext.h:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/MozDownload.h:
* embed/mozilla/mozilla-download.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
Merged nsIDownload API changes from HEAD.
Diffstat (limited to 'embed/mozilla/MozDownload.h')
| -rw-r--r-- | embed/mozilla/MozDownload.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/embed/mozilla/MozDownload.h b/embed/mozilla/MozDownload.h index ad5cfb169..35a81ad2a 100644 --- a/embed/mozilla/MozDownload.h +++ b/embed/mozilla/MozDownload.h @@ -34,7 +34,10 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * - * ***** END LICENSE BLOCK ***** */ + * ***** END LICENSE BLOCK ***** + * + * $Id$ + */ #ifndef MozDownload_h__ #define MozDownload_h__ @@ -95,6 +98,9 @@ public: virtual ~MozDownload(); NS_DECL_ISUPPORTS +#if MOZILLA_SNAPSHOT > 15 + NS_DECL_NSITRANSFER +#endif NS_DECL_NSIDOWNLOAD NS_DECL_NSIWEBPROGRESSLISTENER @@ -106,14 +112,25 @@ 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; |