Removed PrefsCore from appcores - it's now an autoregistered, idlized component.
git-svn-id: svn://10.0.0.236/trunk@34483 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -34,7 +34,6 @@ IDLSRCS= \
|
||||
BrowserAppCore.idl \
|
||||
DOMPropsCore.idl \
|
||||
EditorAppCore.idl \
|
||||
PrefsCore.idl \
|
||||
SignonCore.idl \
|
||||
CookieCore.idl \
|
||||
WalletCore.idl \
|
||||
|
||||
Binary file not shown.
@@ -28,7 +28,6 @@ EXPORTS = \
|
||||
nsIDOMBaseAppCore.h \
|
||||
nsIDOMDOMPropsCore.h \
|
||||
nsIDOMEditorAppCore.h \
|
||||
nsIDOMPrefsCore.h \
|
||||
nsIDOMSignonCore.h \
|
||||
nsIDOMCookieCore.h \
|
||||
nsIDOMWalletCore.h \
|
||||
|
||||
@@ -25,7 +25,6 @@ EXPORTS= \
|
||||
nsIDOMAppCoresManager.h \
|
||||
nsIDOMBaseAppCore.h \
|
||||
nsIDOMDOMPropsCore.h \
|
||||
nsIDOMPrefsCore.h \
|
||||
nsIDOMSignonCore.h \
|
||||
nsIDOMCookieCore.h \
|
||||
nsIDOMWalletCore.h \
|
||||
|
||||
@@ -21,11 +21,6 @@
|
||||
0xb2a68895, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56} \
|
||||
}
|
||||
|
||||
#define NS_PREFSCORE_CID \
|
||||
{ /* 55af8385-e11e-11d2-915f-a053f05ff7bc */ \
|
||||
0x55af8385, 0xe11e, 0x11d2, { 0x91, 0x5f, 0xa0, 0x53, 0xf0, 0x5f, 0xf7, 0xbc} \
|
||||
}
|
||||
|
||||
#define NS_SIGNONCORE_CID \
|
||||
{ /* {96A79E90-0E30-11d3-AB9F-0080C787AD96 */ \
|
||||
0x96a79e90, 0xe30, 0x11d3, { 0xab, 0x9f, 0x0, 0x80, 0xc7, 0x87, 0xad, 0x96} \
|
||||
|
||||
@@ -36,7 +36,6 @@ CPPSRCS= \
|
||||
nsBaseAppCore.cpp \
|
||||
nsDOMPropsCore.cpp \
|
||||
nsDOMPropsCoreFactory.cpp \
|
||||
nsPrefsCore.cpp \
|
||||
nsSignonCore.cpp \
|
||||
nsCookieCore.cpp \
|
||||
nsWalletCore.cpp \
|
||||
@@ -49,7 +48,6 @@ CPPSRCS= \
|
||||
nsToolbarCore.cpp \
|
||||
nsToolkitCore.cpp \
|
||||
nsBrowserAppCore.cpp \
|
||||
nsPrefsCoreFactory.cpp \
|
||||
nsSignonCoreFactory.cpp \
|
||||
nsCookieCoreFactory.cpp \
|
||||
nsWalletCoreFactory.cpp \
|
||||
@@ -63,7 +61,6 @@ CPPSRCS= \
|
||||
nsJSAppCoresManager.cpp \
|
||||
nsJSDOMPropsCore.cpp \
|
||||
nsJSEditorAppCore.cpp \
|
||||
nsJSPrefsCore.cpp \
|
||||
nsJSSignonCore.cpp \
|
||||
nsJSCookieCore.cpp \
|
||||
nsJSWalletCore.cpp \
|
||||
|
||||
@@ -70,7 +70,6 @@ OBJS = \
|
||||
.\$(OBJDIR)\nsBaseAppCore.obj \
|
||||
.\$(OBJDIR)\nsDOMPropsCore.obj \
|
||||
.\$(OBJDIR)\nsDOMPropsCoreFactory.obj \
|
||||
.\$(OBJDIR)\nsPrefsCore.obj \
|
||||
.\$(OBJDIR)\nsSignonCore.obj \
|
||||
.\$(OBJDIR)\nsCookieCore.obj \
|
||||
.\$(OBJDIR)\nsWalletCore.obj \
|
||||
@@ -83,7 +82,6 @@ OBJS = \
|
||||
.\$(OBJDIR)\nsToolkitCore.obj \
|
||||
.\$(OBJDIR)\nsToolkitCoreFactory.obj \
|
||||
.\$(OBJDIR)\nsBrowserAppCore.obj \
|
||||
.\$(OBJDIR)\nsPrefsCoreFactory.obj \
|
||||
.\$(OBJDIR)\nsSignonCoreFactory.obj \
|
||||
.\$(OBJDIR)\nsCookieCoreFactory.obj \
|
||||
.\$(OBJDIR)\nsWalletCoreFactory.obj \
|
||||
@@ -94,7 +92,6 @@ OBJS = \
|
||||
.\$(OBJDIR)\nsJSBaseAppCore.obj \
|
||||
.\$(OBJDIR)\nsJSAppCoresManager.obj \
|
||||
.\$(OBJDIR)\nsJSDOMPropsCore.obj \
|
||||
.\$(OBJDIR)\nsJSPrefsCore.obj \
|
||||
.\$(OBJDIR)\nsJSSignonCore.obj \
|
||||
.\$(OBJDIR)\nsJSCookieCore.obj \
|
||||
.\$(OBJDIR)\nsJSWalletCore.obj \
|
||||
@@ -114,31 +111,6 @@ include <$(DEPTH)\config\rules.mak>
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
|
||||
$(MAKE_INSTALL) ..\xul\pref-advanced.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-applications.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-appearance.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-cache.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-colors.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-composer.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-download.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-fonts.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-languages.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-navigator.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-offline.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-proxies.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-publish.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-select.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-smart_browsing.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref-smartupdate.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\pref.css $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\prefbottom.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\PrefsWindow.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\PrefsWindow.js $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\SignonWindow.js $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\CookieWindow.js $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\WalletWindow.js $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\preftree.css $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\preftree.xul $(DIST)\bin\res\samples
|
||||
|
||||
$(MAKE_INSTALL) ..\xul\resources\Mail_SendMsg.gif $(DIST)\bin\res\toolbar
|
||||
$(MAKE_INSTALL) ..\xul\resources\Mail_GetMsg.gif $(DIST)\bin\res\toolbar
|
||||
|
||||
@@ -42,7 +42,6 @@ static PRInt32 gInstanceCnt = 0;
|
||||
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
|
||||
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
|
||||
static NS_DEFINE_IID(kDOMPropsCoreCID, NS_DOMPROPSCORE_CID);
|
||||
static NS_DEFINE_IID(kPrefsCoreCID, NS_PREFSCORE_CID);
|
||||
static NS_DEFINE_IID(kSignonCoreCID, NS_SIGNONCORE_CID);
|
||||
static NS_DEFINE_IID(kCookieCoreCID, NS_COOKIECORE_CID);
|
||||
static NS_DEFINE_IID(kWalletCoreCID, NS_WALLETCORE_CID);
|
||||
@@ -71,7 +70,6 @@ NSRegisterSelf(nsISupports* serviceMgr, const char *path)
|
||||
printf("*** AppCores object is being registered\n");
|
||||
nsComponentManager::RegisterComponent(kAppCoresManagerCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kDOMPropsCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kPrefsCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kSignonCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kCookieCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
nsComponentManager::RegisterComponent(kWalletCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
|
||||
@@ -91,7 +89,6 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
|
||||
|
||||
nsComponentManager::UnregisterComponent(kAppCoresManagerCID, path);
|
||||
nsComponentManager::UnregisterComponent(kDOMPropsCoreCID, path);
|
||||
nsComponentManager::UnregisterComponent(kPrefsCoreCID, path);
|
||||
nsComponentManager::UnregisterComponent(kSignonCoreCID, path);
|
||||
nsComponentManager::UnregisterComponent(kCookieCoreCID, path);
|
||||
nsComponentManager::UnregisterComponent(kWalletCoreCID, path);
|
||||
@@ -130,10 +127,6 @@ NSGetFactory(nsISupports* serviceMgr,
|
||||
{
|
||||
inst = new nsDOMPropsCoreFactory();
|
||||
}
|
||||
else if ( aClass.Equals(kPrefsCoreCID) )
|
||||
{
|
||||
inst = new nsPrefsCoreFactory();
|
||||
}
|
||||
else if ( aClass.Equals(kSignonCoreCID) )
|
||||
{
|
||||
inst = new nsSignonCoreFactory();
|
||||
|
||||
@@ -43,7 +43,6 @@ static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
|
||||
static NS_DEFINE_IID(kAppCoresCID, NS_APPCORESMANAGER_CID);
|
||||
static NS_DEFINE_IID(kToolkitCoreCID, NS_TOOLKITCORE_CID);
|
||||
static NS_DEFINE_IID(kDOMPropsCoreCID, NS_DOMPROPSCORE_CID);
|
||||
static NS_DEFINE_IID(kPrefsCoreCID, NS_PREFSCORE_CID);
|
||||
static NS_DEFINE_IID(kSignonCoreCID, NS_SIGNONCORE_CID);
|
||||
static NS_DEFINE_IID(kCookieCoreCID, NS_COOKIECORE_CID);
|
||||
static NS_DEFINE_IID(kWalletCoreCID, NS_WALLETCORE_CID);
|
||||
@@ -76,7 +75,6 @@ nsAppCoresNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
|
||||
if (NS_OK != result) return result;
|
||||
|
||||
result = NS_InitDOMPropsCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitPrefsCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitSignonCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitCookieCoreClass(aScriptContext, nsnull);
|
||||
result = NS_InitWalletCoreClass(aScriptContext, nsnull);
|
||||
@@ -108,14 +106,6 @@ nsAppCoresNameSet::AddNameSet(nsIScriptContext* aScriptContext)
|
||||
|
||||
if (NS_OK != result) return result;
|
||||
|
||||
result = manager->RegisterGlobalName("PrefsCore",
|
||||
kPrefsCoreCID,
|
||||
PR_TRUE);
|
||||
|
||||
if (NS_OK != result) return result;
|
||||
|
||||
|
||||
|
||||
result = manager->RegisterGlobalName("SignonCore",
|
||||
kSignonCoreCID,
|
||||
PR_TRUE);
|
||||
|
||||
@@ -25,31 +25,9 @@ include $(topsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXPORT_RESOURCE_SAMPLES = \
|
||||
$(srcdir)/pref-advanced.html \
|
||||
$(srcdir)/pref-applications.html \
|
||||
$(srcdir)/pref-appearance.html \
|
||||
$(srcdir)/pref-cache.html \
|
||||
$(srcdir)/pref-colors.html \
|
||||
$(srcdir)/pref-composer.html \
|
||||
$(srcdir)/pref-download.html \
|
||||
$(srcdir)/pref-fonts.html \
|
||||
$(srcdir)/pref-languages.html \
|
||||
$(srcdir)/pref-navigator.html \
|
||||
$(srcdir)/pref-offline.html \
|
||||
$(srcdir)/pref-proxies.html \
|
||||
$(srcdir)/pref-publish.html \
|
||||
$(srcdir)/pref-select.html \
|
||||
$(srcdir)/pref-smart_browsing.html \
|
||||
$(srcdir)/pref-smartupdate.html \
|
||||
$(srcdir)/prefbottom.html \
|
||||
$(srcdir)/PrefsWindow.html \
|
||||
$(srcdir)/PrefsWindow.js \
|
||||
$(srcdir)/SignonWindow.js \
|
||||
$(srcdir)/CookieWindow.js \
|
||||
$(srcdir)/WalletWindow.js \
|
||||
$(srcdir)/preftree.css \
|
||||
$(srcdir)/preftree.xul \
|
||||
$(srcdir)/pref.css \
|
||||
$(NULL)
|
||||
|
||||
EXPORT_RESOURCE_TOOLBAR = \
|
||||
|
||||
Reference in New Issue
Block a user