diff options
Diffstat (limited to 'embed/mozilla/ContentHandler.h')
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 7498a80f0..6b30add9a 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -22,18 +22,15 @@ #ifndef CONTENT_HANDLER_H #define CONTENT_HANDLER_H -#include "ephy-file-helpers.h" - #include <libgnomevfs/gnome-vfs-mime-handlers.h> -#undef MOZILLA_INTERNAL_API -#include <nsEmbedString.h> -#define MOZILLA_INTERNAL_API 1 #include <nsCOMPtr.h> -#include <nsISupports.h> -#include <nsIURI.h> #include <nsIFile.h> #include <nsIHelperAppLauncherDialog.h> +#include <nsIURI.h> + +#include "ephy-file-helpers.h" + typedef enum { @@ -76,12 +73,8 @@ class GContentHandler : public nsIHelperAppLauncherDialog GnomeVFSMimeApplication *mHelperApp; EphyMimePermission mPermission; - nsEmbedCString mUrl; -#ifdef HAVE_GECKO_1_8 - nsEmbedCString mMimeType; -#else - char *mMimeType; -#endif + nsCString mUrl; + nsCString mMimeType; PRUint32 mUserTime; }; |