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/ContentHandler.h | |
| parent | b699b40d663955560655271f7645ae277e6076c8 (diff) | |
| download | gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.zst gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.zip | |
merge mozilla-embed-strings branch
Diffstat (limited to 'embed/mozilla/ContentHandler.h')
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index a66f36b49..df77559d4 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -25,6 +25,7 @@ #include "config.h" #endif +#include "mozilla-version.h" #include "ephy-embed-shell.h" #include <libgnomevfs/gnome-vfs-mime-handlers.h> @@ -33,13 +34,9 @@ #include <nsISupports.h> #include <nsIURI.h> #include <nsIFile.h> - +#include <nsEmbedString.h> #include <nsIHelperAppLauncherDialog.h> -#ifdef ALLOW_PRIVATE_STRINGS -#include <nsString.h> -#endif - typedef enum { CONTENT_ACTION_OPEN, @@ -57,8 +54,6 @@ typedef enum {0x9b, 0xeb, 0x93, 0x35, 0xc0, 0x6b, 0xbe, 0xae} \ } -class nsIFactory; - class GContentHandler : public nsIHelperAppLauncherDialog { public: @@ -82,18 +77,18 @@ class GContentHandler : public nsIHelperAppLauncherDialog nsCOMPtr<nsIFile> mTempFile; nsCOMPtr<nsISupports> mContext; -#if MOZILLA_SNAPSHOT < 18 - char *mMimeType; -#else - nsCString mMimeType; -#endif PRBool mAppSupportScheme; GnomeVFSMimeApplication *mHelperApp; ContentAction mAction; EphyMimePermission mPermission; - nsCString mUrl; - nsCString mScheme; + nsEmbedCString mUrl; + nsEmbedCString mScheme; +#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) + nsEmbedCString mMimeType; +#else + char *mMimeType; +#endif }; -#endif +#endif /* __ContentHandler_h */ |