diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-10-10 23:09:26 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-10-10 23:09:26 +0000 |
| commit | 0c222d068c7ebe9315c4c54731591ce6785d1f42 (patch) | |
| tree | af760fc029cd08b6e339e5efb92453f9cafa19cc /chrome | |
| parent | 0ea4019528592afbe0ae918350dd259ef6e5719a (diff) | |
| download | aura-central-0c222d068c7ebe9315c4c54731591ce6785d1f42.tar.gz | |
Issue %3010 - Remove --disable-xul config and conditionals.
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/nsChromeRegistry.cpp | 2 | ||||
| -rw-r--r-- | chrome/nsChromeRegistry.h | 6 | ||||
| -rw-r--r-- | chrome/nsChromeRegistryChrome.cpp | 2 | ||||
| -rw-r--r-- | chrome/nsChromeRegistryChrome.h | 2 |
4 files changed, 0 insertions, 12 deletions
diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp index e25e7bbcf..ef2cb79ab 100644 --- a/chrome/nsChromeRegistry.cpp +++ b/chrome/nsChromeRegistry.cpp @@ -108,9 +108,7 @@ NS_INTERFACE_MAP_BEGIN(nsChromeRegistry) NS_INTERFACE_MAP_ENTRY(nsIChromeRegistry) NS_INTERFACE_MAP_ENTRY(nsIXULChromeRegistry) NS_INTERFACE_MAP_ENTRY(nsIToolkitChromeRegistry) -#ifdef MOZ_XUL NS_INTERFACE_MAP_ENTRY(nsIXULOverlayProvider) -#endif NS_INTERFACE_MAP_ENTRY(nsIObserver) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIChromeRegistry) diff --git a/chrome/nsChromeRegistry.h b/chrome/nsChromeRegistry.h index f47c8e605..27b45791f 100644 --- a/chrome/nsChromeRegistry.h +++ b/chrome/nsChromeRegistry.h @@ -9,11 +9,7 @@ #include "nsIToolkitChromeRegistry.h" #include "nsIObserver.h" #include "nsWeakReference.h" - -#ifdef MOZ_XUL #include "nsIXULOverlayProvider.h" -#endif - #include "nsString.h" #include "nsURIHashKey.h" #include "nsInterfaceHashtable.h" @@ -37,9 +33,7 @@ class nsIURL; { 0x47049e42, 0x1d87, 0x482a, { 0x98, 0x4d, 0x56, 0xae, 0x18, 0x5e, 0x36, 0x7a } } class nsChromeRegistry : public nsIToolkitChromeRegistry, -#ifdef MOZ_XUL public nsIXULOverlayProvider, -#endif public nsIObserver, public nsSupportsWeakReference { diff --git a/chrome/nsChromeRegistryChrome.cpp b/chrome/nsChromeRegistryChrome.cpp index fef2afc37..c115280fd 100644 --- a/chrome/nsChromeRegistryChrome.cpp +++ b/chrome/nsChromeRegistryChrome.cpp @@ -638,7 +638,6 @@ nsChromeRegistryChrome::OverlayListHash::GetArray(nsIURI* aBase) return &entry->mArray; } -#ifdef MOZ_XUL NS_IMETHODIMP nsChromeRegistryChrome::GetStyleOverlays(nsIURI *aChromeURL, nsISimpleEnumerator **aResult) @@ -668,7 +667,6 @@ nsChromeRegistryChrome::GetXULOverlays(nsIURI *aChromeURL, return NS_NewArrayEnumerator(aResult, *parray); } -#endif // MOZ_XUL nsIURI* nsChromeRegistry::ManifestProcessingContext::GetManifestURI() diff --git a/chrome/nsChromeRegistryChrome.h b/chrome/nsChromeRegistryChrome.h index 4d12ca783..60e93274e 100644 --- a/chrome/nsChromeRegistryChrome.h +++ b/chrome/nsChromeRegistryChrome.h @@ -41,12 +41,10 @@ class nsChromeRegistryChrome : public nsChromeRegistry NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic, const char16_t *someData) override; -#ifdef MOZ_XUL NS_IMETHOD GetXULOverlays(nsIURI *aURI, nsISimpleEnumerator **_retval) override; NS_IMETHOD GetStyleOverlays(nsIURI *aURI, nsISimpleEnumerator **_retval) override; -#endif // If aChild is non-null then it is a new child to notify. If aChild is // null, then we have installed new chrome and we are resetting all of our |