diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/GlobalHistory.cpp | 5 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index c2ba7a1ae..e46af14cd 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -43,8 +43,13 @@ MozGlobalHistory::~MozGlobalHistory () { } +#ifdef MOZ_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER +/* void addURI (in nsIURI aURI, in boolean aRedirect, in boolean aToplevel, in nsIURI aReferrer); */ +NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aToplevel, nsIURI *aReferrer) +#else /* void addURI (in nsIURI aURI, in boolean aRedirect, in boolean aToplevel); */ NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aToplevel) +#endif { nsresult rv; diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index d4262b1cd..9525b5fa2 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -71,9 +71,14 @@ #include <nsIPassword.h> #endif +#if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H) +#include <chrome/nsIChromeRegistrySea.h> +#elif defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN) +#include <nsIChromeRegistry.h> +#endif + #ifdef ALLOW_PRIVATE_API // FIXME: For setting the locale. hopefully gtkmozembed will do itself soon -#include <nsIChromeRegistry.h> #include <nsILocaleService.h> #include <nsIHttpAuthManager.h> #include <nsICacheService.h> @@ -404,11 +409,15 @@ static nsresult mozilla_init_chrome (void) { /* FIXME: can we just omit this on new-toolkit ? */ -#ifdef MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN +#if defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN) || defined(HAVE_CHROME_NSICHROMEREGISTRYSEA_H) nsresult rv; nsEmbedString uiLang; +#ifdef HAVE_CHROME_NSICHROMEREGISTRYSEA_H + nsCOMPtr<nsIChromeRegistrySea> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID); +#else nsCOMPtr<nsIXULChromeRegistry> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID); +#endif NS_ENSURE_TRUE (chromeRegistry, NS_ERROR_FAILURE); // Set skin to 'classic' so we get native scrollbars. |