forked from mirrors/gecko-dev
Bug 550145 NS_APPSTARTUP_CONTRACTID should exist in nsToolkitCompsCID.h and not nsXPFEComponentsCID.h (kill nsXPFEComponentsCID.h). r=benjamin
This commit is contained in:
Mark Banner
parent
1c240791e6
commit
c1f7eefbf4
11 changed files with 5 additions and 69 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@
|
|||
#include "nsIInterfaceRequestorUtils.h"
|
||||
#include "nsWidgetsCID.h"
|
||||
#include "nsAppShellCID.h"
|
||||
#include "nsXPFEComponentsCID.h"
|
||||
|
||||
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,6 @@
|
|||
#include "nsXPCOM.h"
|
||||
#include "nsXPCOMCIDInternal.h"
|
||||
#include "nsXPIDLString.h"
|
||||
#include "nsXPFEComponentsCID.h"
|
||||
#include "nsVersionComparator.h"
|
||||
|
||||
#include "nsAppDirectoryServiceDefs.h"
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@
|
|||
#include "nsString.h"
|
||||
#include "nsThreadUtils.h"
|
||||
#include "nsWidgetsCID.h"
|
||||
#include "nsXPFEComponentsCID.h"
|
||||
#include "nsXREDirProvider.h"
|
||||
|
||||
#ifdef MOZ_IPC
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
#include "nsCOMPtr.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIAppStartup.h"
|
||||
#include "nsXPFEComponentsCID.h"
|
||||
#include "nsToolkitCompsCID.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WIDGET_PHOTON
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
MODULE = appcomps
|
||||
|
||||
EXPORTS = nsXPFEComponentsCID.h
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
MOZ_HAVE_BROWSER=1
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
#include "nsRDFCID.h"
|
||||
#endif
|
||||
#include "nsCURILoader.h"
|
||||
#include "nsXPFEComponentsCID.h"
|
||||
|
||||
#ifdef MOZ_RDF
|
||||
// Factory constructors
|
||||
|
|
|
|||
|
|
@ -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 <bsmedberg@covad.net>
|
||||
* 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
|
||||
Loading…
Reference in a new issue