From c1f7eefbf44e8e06d8b53cec94b95c7dfaa3b133 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Fri, 5 Mar 2010 12:11:55 +0000 Subject: [PATCH] Bug 550145 NS_APPSTARTUP_CONTRACTID should exist in nsToolkitCompsCID.h and not nsXPFEComponentsCID.h (kill nsXPFEComponentsCID.h). r=benjamin --- .../pref/autoconfig/src/nsReadConfig.cpp | 2 +- toolkit/components/build/nsToolkitCompsCID.h | 3 + .../components/build/nsToolkitCompsModule.cpp | 1 - .../components/startup/src/nsAppStartup.cpp | 1 - toolkit/xre/nsAppRunner.cpp | 1 - toolkit/xre/nsEmbedFunctions.cpp | 1 - toolkit/xre/nsNativeAppSupportCocoa.mm | 2 - toolkit/xre/nsSigHandlers.cpp | 2 +- xpfe/components/Makefile.in | 2 - xpfe/components/build/nsModule.cpp | 1 - xpfe/components/nsXPFEComponentsCID.h | 58 ------------------- 11 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 xpfe/components/nsXPFEComponentsCID.h diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp index c320d385b7e2..85fbb48a1f5e 100644 --- a/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -54,7 +54,7 @@ #include "nsIPromptService.h" #include "nsIServiceManager.h" #include "nsIStringBundle.h" -#include "nsXPFEComponentsCID.h" +#include "nsToolkitCompsCID.h" #include "nsXPIDLString.h" #include "nsNetUtil.h" #include "prmem.h" diff --git a/toolkit/components/build/nsToolkitCompsCID.h b/toolkit/components/build/nsToolkitCompsCID.h index e2ea5f157a44..c7772f5a5f94 100644 --- a/toolkit/components/build/nsToolkitCompsCID.h +++ b/toolkit/components/build/nsToolkitCompsCID.h @@ -113,6 +113,9 @@ #define NS_FAVICONSERVICE_CONTRACTID \ "@mozilla.org/browser/favicon-service;1" +#define NS_APPSTARTUP_CONTRACTID \ + "@mozilla.org/toolkit/app-startup;1" + ///////////////////////////////////////////////////////////////////////////// // {A0CCAAF8-09DA-44D8-B250-9AC3E93C8117} diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp index b415cfbfab8a..76780a794327 100644 --- a/toolkit/components/build/nsToolkitCompsModule.cpp +++ b/toolkit/components/build/nsToolkitCompsModule.cpp @@ -38,7 +38,6 @@ #include "nsIGenericFactory.h" #include "nsAppStartup.h" #include "nsUserInfo.h" -#include "nsXPFEComponentsCID.h" #include "nsToolkitCompsCID.h" #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS) diff --git a/toolkit/components/startup/src/nsAppStartup.cpp b/toolkit/components/startup/src/nsAppStartup.cpp index 6d4b905af8fb..822e8825c252 100644 --- a/toolkit/components/startup/src/nsAppStartup.cpp +++ b/toolkit/components/startup/src/nsAppStartup.cpp @@ -68,7 +68,6 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsWidgetsCID.h" #include "nsAppShellCID.h" -#include "nsXPFEComponentsCID.h" static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 06e841e98a7c..9dc5aa043f37 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -130,7 +130,6 @@ #include "nsXPCOM.h" #include "nsXPCOMCIDInternal.h" #include "nsXPIDLString.h" -#include "nsXPFEComponentsCID.h" #include "nsVersionComparator.h" #include "nsAppDirectoryServiceDefs.h" diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index eaf5014a29b9..034e77a83892 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -72,7 +72,6 @@ #include "nsString.h" #include "nsThreadUtils.h" #include "nsWidgetsCID.h" -#include "nsXPFEComponentsCID.h" #include "nsXREDirProvider.h" #ifdef MOZ_IPC diff --git a/toolkit/xre/nsNativeAppSupportCocoa.mm b/toolkit/xre/nsNativeAppSupportCocoa.mm index 32d4786e95cb..4089a8b15174 100644 --- a/toolkit/xre/nsNativeAppSupportCocoa.mm +++ b/toolkit/xre/nsNativeAppSupportCocoa.mm @@ -59,8 +59,6 @@ #include "nsIWidget.h" #include "nsIWindowMediator.h" -#include "nsXPFEComponentsCID.h" - const OSType kNSCreator = 'MOSS'; const OSType kMozCreator = 'MOZZ'; const SInt16 kNSCanRunStrArrayID = 1000; diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp index 95e5768a467f..f66d6c0d506d 100644 --- a/toolkit/xre/nsSigHandlers.cpp +++ b/toolkit/xre/nsSigHandlers.cpp @@ -76,7 +76,7 @@ #include "nsCOMPtr.h" #include "nsIServiceManager.h" #include "nsIAppStartup.h" -#include "nsXPFEComponentsCID.h" +#include "nsToolkitCompsCID.h" #endif #ifdef MOZ_WIDGET_PHOTON diff --git a/xpfe/components/Makefile.in b/xpfe/components/Makefile.in index 35a67b663080..92d4558294d9 100644 --- a/xpfe/components/Makefile.in +++ b/xpfe/components/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = appcomps -EXPORTS = nsXPFEComponentsCID.h - include $(topsrcdir)/config/config.mk MOZ_HAVE_BROWSER=1 diff --git a/xpfe/components/build/nsModule.cpp b/xpfe/components/build/nsModule.cpp index d44c93010a78..8733c36a8208 100644 --- a/xpfe/components/build/nsModule.cpp +++ b/xpfe/components/build/nsModule.cpp @@ -45,7 +45,6 @@ #include "nsRDFCID.h" #endif #include "nsCURILoader.h" -#include "nsXPFEComponentsCID.h" #ifdef MOZ_RDF // Factory constructors diff --git a/xpfe/components/nsXPFEComponentsCID.h b/xpfe/components/nsXPFEComponentsCID.h deleted file mode 100644 index 543fde2a9745..000000000000 --- a/xpfe/components/nsXPFEComponentsCID.h +++ /dev/null @@ -1,58 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Gecko. - * - * The Initial Developer of the Original Code is - * Benjamin Smedberg - * Portions created by the Initial Developer are Copyright (C) 2004 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsXPFEComponentsCID_h__ -#define nsXPFEComponentsCID_h__ - -/** - * The command line service is initialized at application startup with the - * application command line. It may not exist at all in embedding situations. - * - * @implements nsICommandLineService - */ -#define NS_COMMANDLINESERVICE_CONTRACTID \ - "@mozilla.org/app-startup/commandLineService;1" - -/** - * The app startup service is created during startup of an XUL application, - * and serves the window creator. It may not be valid in embedding situations. - * - * @implements nsIAppStartup, nsIWindowCreator, nsIWindowCreator2 - */ -#define NS_APPSTARTUP_CONTRACTID \ - "@mozilla.org/toolkit/app-startup;1" - -#endif