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/GlobalHistory.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/GlobalHistory.h')
| -rw-r--r-- | embed/mozilla/GlobalHistory.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/embed/mozilla/GlobalHistory.h b/embed/mozilla/GlobalHistory.h index 3b0bab389..883b9e8db 100644 --- a/embed/mozilla/GlobalHistory.h +++ b/embed/mozilla/GlobalHistory.h @@ -29,11 +29,7 @@ #include "ephy-history.h" #include <nsIBrowserHistory.h> -#if MOZILLA_SNAPSHOT > 13 #include <nsIGlobalHistory2.h> -#else -#include <nsIGlobalHistory.h> -#endif #define EPHY_GLOBALHISTORY_CLASSNAME "Epiphany Global History Implementation" @@ -44,22 +40,14 @@ { 0xb7, 0x9e, 0xf7, 0xaa, 0x49, 0xeb, 0x6a, 0x15} \ } -class MozGlobalHistory: -#if MOZILLA_SNAPSHOT <= 13 - public nsIGlobalHistory, -#endif - public nsIBrowserHistory +class MozGlobalHistory: public nsIBrowserHistory { public: MozGlobalHistory (); virtual ~MozGlobalHistory(); NS_DECL_ISUPPORTS -#if MOZILLA_SNAPSHOT > 13 NS_DECL_NSIGLOBALHISTORY2 -#else - NS_DECL_NSIGLOBALHISTORY -#endif NS_DECL_NSIBROWSERHISTORY private: |