diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-10-10 23:09:26 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-01 14:47:16 +0200 |
| commit | ddaee7c1be914cc28a28cbe27e5922215b3b2e6f (patch) | |
| tree | cb8930a9ba1ed0ef574b7c2be9035b1a51201902 /embedding | |
| parent | c030a50228349fa1b2c0b4fbc2e83752324dd4d7 (diff) | |
| download | uxp-ddaee7c1be914cc28a28cbe27e5922215b3b2e6f.tar.gz | |
Issue #1830 - Remove --disable-xul config and conditionals.
Diffstat (limited to 'embedding')
| -rw-r--r-- | embedding/components/build/nsEmbeddingModule.cpp | 8 | ||||
| -rw-r--r-- | embedding/components/moz.build | 4 | ||||
| -rw-r--r-- | embedding/components/windowwatcher/moz.build | 8 |
3 files changed, 3 insertions, 17 deletions
diff --git a/embedding/components/build/nsEmbeddingModule.cpp b/embedding/components/build/nsEmbeddingModule.cpp index 48351ec3ad..6d0da1f13f 100644 --- a/embedding/components/build/nsEmbeddingModule.cpp +++ b/embedding/components/build/nsEmbeddingModule.cpp @@ -35,7 +35,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandParams) NS_GENERIC_FACTORY_CONSTRUCTOR(nsControllerCommandGroup) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseCommandController) -#ifdef MOZ_XUL NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock) #ifdef NS_PRINTING NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init) @@ -44,14 +43,11 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsPrintingProxy, nsPrintingProxy::GetInstance) #endif #endif -#endif -#ifdef MOZ_XUL NS_DEFINE_NAMED_CID(NS_DIALOGPARAMBLOCK_CID); #ifdef NS_PRINTING NS_DEFINE_NAMED_CID(NS_PRINTINGPROMPTSERVICE_CID); #endif -#endif NS_DEFINE_NAMED_CID(NS_WINDOWWATCHER_CID); NS_DEFINE_NAMED_CID(NS_FIND_CID); NS_DEFINE_NAMED_CID(NS_WEB_BROWSER_FIND_CID); @@ -64,7 +60,6 @@ NS_DEFINE_NAMED_CID(NS_CONTROLLER_COMMAND_GROUP_CID); NS_DEFINE_NAMED_CID(NS_BASECOMMANDCONTROLLER_CID); static const mozilla::Module::CIDEntry kEmbeddingCIDs[] = { -#ifdef MOZ_XUL { &kNS_DIALOGPARAMBLOCK_CID, false, nullptr, nsDialogParamBlockConstructor }, #ifdef NS_PRINTING @@ -77,7 +72,6 @@ static const mozilla::Module::CIDEntry kEmbeddingCIDs[] = { { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceConstructor }, #endif #endif -#endif { &kNS_WINDOWWATCHER_CID, false, nullptr, nsWindowWatcherConstructor }, { &kNS_FIND_CID, false, nullptr, nsFindConstructor }, { &kNS_WEB_BROWSER_FIND_CID, false, nullptr, nsWebBrowserFindConstructor }, @@ -92,12 +86,10 @@ static const mozilla::Module::CIDEntry kEmbeddingCIDs[] = { }; static const mozilla::Module::ContractIDEntry kEmbeddingContracts[] = { -#ifdef MOZ_XUL { NS_DIALOGPARAMBLOCK_CONTRACTID, &kNS_DIALOGPARAMBLOCK_CID }, #ifdef NS_PRINTING { NS_PRINTINGPROMPTSERVICE_CONTRACTID, &kNS_PRINTINGPROMPTSERVICE_CID }, #endif -#endif { NS_WINDOWWATCHER_CONTRACTID, &kNS_WINDOWWATCHER_CID }, { NS_FIND_CONTRACTID, &kNS_FIND_CID }, { NS_WEB_BROWSER_FIND_CONTRACTID, &kNS_WEB_BROWSER_FIND_CID }, diff --git a/embedding/components/moz.build b/embedding/components/moz.build index 5b8788a25a..2d7914aa96 100644 --- a/embedding/components/moz.build +++ b/embedding/components/moz.build @@ -11,9 +11,7 @@ DIRS += [ 'find', 'webbrowserpersist', 'commandhandler', + 'printingui', ] -if CONFIG['MOZ_XUL']: - DIRS += ['printingui'] - DIRS += ['build'] diff --git a/embedding/components/windowwatcher/moz.build b/embedding/components/windowwatcher/moz.build index d0257d90b1..a4183da325 100644 --- a/embedding/components/windowwatcher/moz.build +++ b/embedding/components/windowwatcher/moz.build @@ -21,8 +21,9 @@ EXPORTS += [ 'nsPromptUtils.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsAutoWindowStateHelper.cpp', + 'nsDialogParamBlock.cpp', 'nsWindowWatcher.cpp', ] @@ -30,11 +31,6 @@ EXPORTS += [ 'nsWindowWatcher.h', ] -if CONFIG['MOZ_XUL']: - UNIFIED_SOURCES += [ - 'nsDialogParamBlock.cpp', - ] - FINAL_LIBRARY = 'xul' # For nsJSUtils LOCAL_INCLUDES += [ |