Bug 451909 - kill MOZ_XUL_APP now that all apps set it; extensions cleanup (spellchecker, layout-debug); r+sr=(bienvenu + dbaron)

extensions/layout-debug/src/nsDebugFactory.cpp

@@ -50,8 +50,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegressionTester)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLayoutDebuggingTools)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLayoutDebugCLH)
 
-#ifdef MOZ_XUL_APP
-
 static NS_IMETHODIMP
 RegisterCommandLineHandlers(nsIComponentManager* compMgr, nsIFile* path,
                             const char *location, const char *type,
@@ -84,8 +82,6 @@ UnregisterCommandLineHandlers(nsIComponentManager* compMgr, nsIFile *path,
   return NS_OK;
 }
 
-#endif
-
 static const nsModuleComponentInfo components[] =
 {
   { "nsRegressionTester",
@@ -102,13 +98,8 @@ static const nsModuleComponentInfo components[] =
     NS_LAYOUTDEBUGCLH_CID,
     "@mozilla.org/commandlinehandler/general-startup;1?type=layoutdebug",
     nsLayoutDebugCLHConstructor,
-#ifdef MOZ_XUL_APP
     RegisterCommandLineHandlers,
     UnregisterCommandLineHandlers
-#else
-    nsLayoutDebugCLH::RegisterProc,
-    nsLayoutDebugCLH::UnregisterProc
-#endif
   }
 };
 

extensions/layout-debug/src/nsLayoutDebugCLH.cpp

@@ -46,10 +46,7 @@
 #include "nsIDOMWindow.h"
 #include "nsISupportsArray.h"
 #include "nsISupportsPrimitives.h"
-
-#ifdef MOZ_XUL_APP
 #include "nsICommandLine.h"
-#endif
 
 nsLayoutDebugCLH::nsLayoutDebugCLH()
 {
@@ -61,8 +58,6 @@ nsLayoutDebugCLH::~nsLayoutDebugCLH()
 
 NS_IMPL_ISUPPORTS1(nsLayoutDebugCLH, ICOMMANDLINEHANDLER)
 
-#ifdef MOZ_XUL_APP
-
 NS_IMETHODIMP
 nsLayoutDebugCLH::Handle(nsICommandLine* aCmdLine)
 {
@@ -121,16 +116,3 @@ nsLayoutDebugCLH::GetHelpInfo(nsACString& aResult)
     return NS_OK;
 }
 
-#else // !MOZ_XUL_APP
-
-CMDLINEHANDLER_IMPL(nsLayoutDebugCLH, "-layoutdebug",
-                    "general.startup.layoutdebug",
-                    "chrome://layoutdebug/content/",
-                    "Start with Layout Debugger",
-                    "@mozilla.org/commandlinehandler/general-startup;1?type=layoutdebug",
-                    "LayoutDebug Startup Handler",
-                    PR_TRUE,
-                    "",
-                    PR_TRUE)
-
-#endif

extensions/layout-debug/src/nsLayoutDebugCLH.h

@@ -40,13 +40,8 @@
 #ifndef nsLayoutDebugCLH_h_
 #define nsLayoutDebugCLH_h_
 
-#ifdef MOZ_XUL_APP
 #include "nsICommandLineHandler.h"
 #define ICOMMANDLINEHANDLER nsICommandLineHandler
-#else
-#include "nsICmdLineHandler.h"
-#define ICOMMANDLINEHANDLER nsICmdLineHandler
-#endif
 
 #define NS_LAYOUTDEBUGCLH_CID \
  { 0xa8f52633, 0x5ecf, 0x424a, \
@@ -59,12 +54,7 @@ public:
     virtual ~nsLayoutDebugCLH();
 
     NS_DECL_ISUPPORTS
-#ifdef MOZ_XUL_APP
     NS_DECL_NSICOMMANDLINEHANDLER
-#else
-    NS_DECL_NSICMDLINEHANDLER
-    CMDLINEHANDLER_REGISTERPROC_DECLS
-#endif
 };
 
 #endif /* !defined(nsLayoutDebugCLH_h_) */

extensions/spellcheck/src/mozSpellCheckerFactory.cpp

@@ -41,10 +41,8 @@
 #include "mozOSXSpell.h"
 #else
 #include "mozHunspell.h"
-#ifdef MOZ_XUL_APP
 #include "mozHunspellDirProvider.h"
 #endif
-#endif
 
 #include "mozSpellChecker.h"
 #include "mozInlineSpellChecker.h"
@@ -72,10 +70,8 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozOSXSpell)
 #else
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozHunspell, Init)
-#ifdef MOZ_XUL_APP
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozHunspellDirProvider)
 #endif
-#endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozSpellChecker, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozPersonalDictionary, Init)
@@ -136,7 +132,6 @@ static nsModuleComponentInfo components[] = {
         MOZ_HUNSPELL_CONTRACTID,
         mozHunspellConstructor
     },
-#ifdef MOZ_XUL_APP
     {
         "mozHunspellDirProvider",
         HUNSPELLDIRPROVIDER_CID,
@@ -145,7 +140,6 @@ static nsModuleComponentInfo components[] = {
         mozHunspellDirProvider::Register,
         mozHunspellDirProvider::Unregister
     },
-#endif // MOZ_XUL_APP
 #endif // MOZ_MACBROWSER
   {
       NULL,