appcores are finally dead on mac, windows and linux. r=alecf

2000-02-06 07:56:31 +00:00 · 2000-02-06 07:56:31 +00:00 · fcff26010d
--- a/xpfe/AppCores/.cvsignore
+++ b/xpfe/AppCores/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/xpfe/AppCores/Makefile.in
+++ b/xpfe/AppCores/Makefile.in
@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src xul idl
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/AppCores/idl/.cvsignore
+++ b/xpfe/AppCores/idl/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/xpfe/AppCores/idl/AppCoresManager.idl
+++ b/xpfe/AppCores/idl/AppCoresManager.idl
@ -1,13 +0,0 @@
-interface AppCoresManager
-{
-/* IID: { 0x18c2f981, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
-	
-	void Startup();
-	void Shutdown();
-	
-	void Add(in BaseAppCore appcore);
-    void Remove(in BaseAppCore appcore);
-
-	BaseAppCore Find(in wstring id);
-};
--- a/xpfe/AppCores/idl/BaseAppCore.idl
+++ b/xpfe/AppCores/idl/BaseAppCore.idl
@ -1,15 +0,0 @@
-interface BaseAppCore
-{
-/* IID: { 0xbe5c13bd, 0xba9f, 0x11d2, \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}} */
-	
-	readonly attribute wstring id;
-	
-	void BaseAppCore();
-	void Init(in wstring id);
-	void SetDocumentCharset(in wstring charset);
-
-
-};
-
-
--- a/xpfe/AppCores/idl/Makefile.in
+++ b/xpfe/AppCores/idl/Makefile.in
@ -1,34 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= appcores
-
-XPIDLSRCS	= nsIDOMBaseAppCore.idl
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/AppCores/idl/PrefsCore.idl
+++ b/xpfe/AppCores/idl/PrefsCore.idl
@ -1,18 +0,0 @@
-interface PrefsCore : BaseAppCore
-{
-/* IID: { 0x55af8384, 0xe11e, 0x11d2, \
-    {0x91, 0x5f, 0xa0, 0x53, 0xf0, 0x5f, 0xf7, 0xbc}} */
-	
-	void PrefsCore();
-	
-	void ShowWindow(in Window currentFrontWin);
-
-	void ChangePanel(in wstring url);
-	void PanelLoaded(in Window win);
-
-	void SavePrefs();
-	void CancelPrefs();
-    void SetSubstitutionVar(in int stringnum, in string val);
-};
-
-
--- a/xpfe/AppCores/idl/ToolkitCore.idl
+++ b/xpfe/AppCores/idl/ToolkitCore.idl
@ -1,12 +0,0 @@
-interface ToolkitCore : BaseAppCore
-{
-/* IID: { 0x1cab9340, 0xc122, 0x11d2, \
-    {0x81, 0xb2, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf}} *\
-
-	void ToolkitCore();
-	void ShowDialog(in wstring url, in Window parent);
-	void ShowWindow(in wstring url, in Window parent);
-	void ShowWindowWithArgs(in wstring url, in Window parent, in wstring args);
-	void ShowModalDialog(in wstring url, in Window parent);
-	void CloseWindow(in Window window);
-};
--- a/xpfe/AppCores/idl/makefile.win
+++ b/xpfe/AppCores/idl/makefile.win
@ -1,69 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-# This makefile isn't intended to be run as a normal part of the build
-# (and isn't, at time of checkin!): it's a convenience for development work.
-# If the IDL compiler has been built (also not a normal part of the build),
-# then running this makefile will generate the h and cpp stubs from idl
-# in this directory, using the DOM IDL compiler.  In practice, since
-# the stubs are pregenerated and checked in, you will want to delete
-# every file from IDLSRCS except the one you're working on, and then
-# run this makefile during development, only.
-
-DEPTH=..\..\..
-
-
-!ifndef IDLSRCS
-IDLSRCS= \
-	AppCoresManager.idl \
-	BaseAppCore.idl     \
-	ToolkitCore.idl
-!endif
-
-
-XPCOM_DESTDIR=..\public
-JSSTUB_DESTDIR=..\src
-
-GENXDIR=genx
-GENJSDIR=genjs
-
-!include <$(DEPTH)\config\rules.mak>
-
-$(GENXDIR):
-	-mkdir $(GENXDIR)
-
-$(GENJSDIR):
-	-mkdir $(GENJSDIR)
-
-IDLC=$(DIST)\bin\idlc.exe
-GENIID=$(DIST)\bin\geniid.pl
-
-export:: $(GENXDIR) $(GENJSDIR) $(IDLSRCS)
-	@echo +++ make: generating xpcom headers
-	$(IDLC) -d $(GENXDIR) -x $(IDLSRCS)
-	@echo +++ make: generating JavaScript stubs
-	$(IDLC) -d $(GENJSDIR) -j $(IDLSRCS)
-
-install::
-	$(MAKE_INSTALL:/=\) $(GENXDIR)\nsIDOM*.h $(XPCOM_DESTDIR)
-	$(MAKE_INSTALL:/=\) $(GENJSDIR)\nsJS*.cpp $(JSSTUB_DESTDIR)
-	$(RM) -r $(GENXDIR)
-	$(RM) -r $(GENJSDIR)
--- a/xpfe/AppCores/idl/nsIDOMBaseAppCore.idl
+++ b/xpfe/AppCores/idl/nsIDOMBaseAppCore.idl
@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* stub interface for compatibility with XPIDL */
-#include "nsISupports.idl"
-
-%{C++
-#include "nsString.h"
-#include "nsIScriptContext.h"
-%}
-native nsString(nsString&);
-native constnsString(const nsString&);
-
-[uuid(be5c13bd-ba9f-11d2-96c4-0060b0fb9956)]
-interface nsIDOMBaseAppCore : nsISupports
-{
-  void GetId(in nsString id);
-  void Init(in constnsString id);
-  void SetDocumentCharset(in constnsString charset);
-};
-
-
-%{C++
-extern "C" NS_DOM nsresult NS_InitBaseAppCoreClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptBaseAppCore(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-%}
--- a/xpfe/AppCores/idl/nsIDOMNodeList.idl
+++ b/xpfe/AppCores/idl/nsIDOMNodeList.idl
@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* stub interface for compatibility with XPIDL */
-#include "nsISupports.idl"
-
-interface nsIDOMNodeList : nsISupports
-{
-  readonly attribute unsigned long length;
-};
-
--- a/xpfe/AppCores/idl/nsIDOMWindow.idl
+++ b/xpfe/AppCores/idl/nsIDOMWindow.idl
@ -1,3 +0,0 @@
-/* stub interface for compatibility with XPIDL */
-interface nsIDOMWindow {};
-
--- a/xpfe/AppCores/idl/nsIDOMXULElement.idl
+++ b/xpfe/AppCores/idl/nsIDOMXULElement.idl
@ -1,2 +0,0 @@
-/* stub interface for compatibility with XPIDL */
-interface nsIDOMXULElement {};
--- a/xpfe/AppCores/idl/nsIDOMXULTreeElement.idl
+++ b/xpfe/AppCores/idl/nsIDOMXULTreeElement.idl
@ -1,2 +0,0 @@
-/* stub interface for compatibility with XPIDL */
-interface nsIDOMXULTreeElement {};
--- a/xpfe/AppCores/macbuild/AppCores.mcp
+++ b/xpfe/AppCores/macbuild/AppCores.mcp
--- a/xpfe/AppCores/macbuild/AppCoresPrefix.h
+++ b/xpfe/AppCores/macbuild/AppCoresPrefix.h
@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* Defining the following causes NS_DOM to be defined as NS_EXPORT. */
-/* This is a temporary solution to fix export problem with auto     */
-/* generated files (nsJSxxx.cpp) who are declared as extern "C"     */
-/* NS_DOM. As Mailnews is build into a separate project and need    */
-/* NS_InitJSBaseAppCore, NS_InitJSBaseAppCore must be correctly     */
-/* exported, for more information, email to ducarroz@netscape.com   */
-#define _IMPL_NS_DOM
-
-#include "MacSharedPrefix.h"
--- a/xpfe/AppCores/macbuild/AppCoresPrefix_debug.h
+++ b/xpfe/AppCores/macbuild/AppCoresPrefix_debug.h
@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* Defining the following causes NS_DOM to be defined as NS_EXPORT. */
-/* This is a temporary solution to fix export problem with auto     */
-/* generated files (nsJSxxx.cpp) who are declared as extern "C"     */
-/* NS_DOM. As Mailnews is build into a separate project and need    */
-/* NS_InitJSBaseAppCore, NS_InitJSBaseAppCore must be correctly     */
-/* exported, for more information, email to ducarroz@netscape.com   */
-#define _IMPL_NS_DOM
-
-#include "MacSharedPrefix_debug.h"
--- a/xpfe/AppCores/makefile.win
+++ b/xpfe/AppCores/makefile.win
@ -1,26 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-
-DIRS=public src
-
-include <$(DEPTH)\config\rules.mak>
--- a/xpfe/AppCores/public/.cvsignore
+++ b/xpfe/AppCores/public/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/xpfe/AppCores/public/MANIFEST
+++ b/xpfe/AppCores/public/MANIFEST
@ -1,9 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:appcores directory
-#
-
-nsIDOMAppCoresManager.h
-nsIDOMBaseAppCore.h
-nsIDOMToolkitCore.h
-nsIDOMBrowserAppCore.h
-nsAppCoresCIDs.h
--- a/xpfe/AppCores/public/Makefile.in
+++ b/xpfe/AppCores/public/Makefile.in
@ -1,40 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXPORTS		= \
-		nsIDOMAppCoresManager.h \
-		nsIDOMBaseAppCore.h \
-		nsIDOMToolkitCore.h \
-		nsIDOMBrowserAppCore.h \
-		nsAppCoresCIDs.h \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/AppCores/public/makefile.win
+++ b/xpfe/AppCores/public/makefile.win
@ -1,36 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-
-
-MODULE=appcores 
-
-EXPORTS=  \
-		nsIDOMAppCoresManager.h		\
-		nsIDOMBaseAppCore.h		\
-		nsIDOMToolkitCore.h		\
-		nsIDOMBrowserAppCore.h		\
-		nsAppCoresCIDs.h       
-
-include <$(DEPTH)\config\rules.mak>
-
--- a/xpfe/AppCores/public/nsAppCoresCIDs.h
+++ b/xpfe/AppCores/public/nsAppCoresCIDs.h
@ -1,105 +0,0 @@
-#ifndef nsAppCoresCIDs_h___
-#define nsAppCoresCIDs_h___
-
-#define NS_APPCORESMANAGER_CID                        \
-{ /* B2A68893-BFA2-11d2-96C8-0060B0FB9956 */         \
-    0xb2a68893, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } \
-}
-
-#define NS_APPCORESFACTORY_CID                 \
-{ /* B2A68894-BFA2-11d2-96C8-0060B0FB9956 */         \
-    0xb2a68894, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56} \
-}
-
-#define NS_DOMPROPSCORE_CID                    \
-{ /* D23EC5D6-E91E-11D2-AAD6-00805F8A4905 */         \
-    0xd23ec5d6, 0xe91e, 0x11d2, { 0xaa, 0xd6, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } \
-}
-
-#define NS_MAILCORE_CID                    \
-{ /* B2A68895-BFA2-11d2-96C8-0060B0FB9956 */         \
-    0xb2a68895, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56} \
-}
-
-#define NS_PROFILECORE_CID             \
-{ /* 3c6dac41-f917-11d2-9f5c-006008a6efe9 */         \
-    0x3c6dac41, 0xf917, 0x11d2, { 0x9f, 0x5c, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-} 
-
-#define	NS_RDFCORE_CID			\
-{ /* 22dcf4e0-cd1d-11d2-8b7e-00805f8a7db5 */	\
-    0x22dcf4e0, 0xcd1d, 0x11d2, { 0x8b, 0x7e, 0x0, 0x80, 0x5f, 0x8a, 0x7d, 0xb5} \
-}
-
-#define NS_MAILCOREFACTORY_CID             \
-{ /* B2A68896-BFA2-11d2-96C8-0060B0FB9956 */         \
-    0xb2a68896, 0xbfa2, 0x11d2, { 0x96, 0xc8, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 }  \
-}
-
-#define NS_TOOLBARCORE_CID                    \
-{ /* BF4AE23E-BA9B-11d2-96C4-0060B0FB9956 */         \
-    0xbf4ae23e, 0xba9b, 0x11d2,                      \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
-}
-
-#define NS_TOOLBARCORE_FACTORY_CID             \
-{ /* BF4AE23F-BA9B-11d2-96C4-0060B0FB9956 */         \
-    00xbf4ae23f, 0xba9b, 0x11d2,                     \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
-}
-
-#define NS_BROWSERAPPCORE_CID                    \
-{ /* BF4AE23E-BA9B-11d2-96C4-0060B0FB9956 */         \
-    0x108d75a0, 0xbab5, 0x11d2,                      \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
-}
-
-#define NS_BROWSERAPPCORE_FACTORY_CID             \
-{ /* BF4AE23F-BA9B-11d2-96C4-0060B0FB9956 */         \
-    0x108d759f, 0xbab5, 0x11d2,                     \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
-}
-
-#define NS_BROWSERAPPCORE_FACTORY_CID             \
-{ /* BF4AE23F-BA9B-11d2-96C4-0060B0FB9956 */         \
-    0x108d759f, 0xbab5, 0x11d2,                     \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
-}
-
-#define NS_TOOLKITCORE_CID                             \
-{ /* 1cab9340-c122-11d2-81b2-0060083a0bcf */          \
-    0x1cab9340, 0xc122, 0x11d2,                       \
-    {0x81, 0xb2, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf}  \
-}
-
-#define NS_TOOLKITCORE_FACTORY_CID                     \
-{ /* 1cab9341-c122-11d2-81b2-0060083a0bcf */          \
-    0x1cab9341, 0xc122, 0x11d2,                       \
-    {0x81, 0xb2, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf}  \
-}
-
-#define NS_THROBBERGLUE_FACTORY_CID \
-{ /* 771C3121-BC44-11d2-8A3F-00805F8A6608 */       \
-    0x771c3121, 0xbc44, 0x11d2,                     \
-    {0x8a, 0x3f, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x8}   \
-}
-
-#define NS_THROBBERGLUE_CID                         \
-{ /* {7A3C4060-BC45-11d2-8A3F-00805F8A6608} */      \
-    0x7a3c4060, 0xbc45, 0x11d2,                     \
-    { 0x8a, 0x3f, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x8 } \
-}
-
-#define NS_EDITORAPPCORE_CID                         \
-{ /* {} */      \
-    0x9afff72b, 0xca9a, 0x11d2,                     \
-    { 0x96, 0xc9, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } \
-}
-
-#define NS_EDITORAPPCORE_FACTORY_CID                     \
-{ /* {739C5B4F-CA9D-11d2-96C9-0060B0FB9956} */          \
-    0x739c5b4f, 0xca9d, 0x11d2,                       \
-    {0x96, 0xc9, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
-}
-
-#endif /* nsAppCoresCIDs_h___ */
--- a/xpfe/AppCores/public/nsIDOMAppCoresManager.h
+++ b/xpfe/AppCores/public/nsIDOMAppCoresManager.h
@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMAppCoresManager_h__
-#define nsIDOMAppCoresManager_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-
-class nsIDOMBaseAppCore;
-
-#define NS_IDOMAPPCORESMANAGER_IID \
- { 0x18c2f981, 0xb09f, 0x11d2, \
-  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
-
-class nsIDOMAppCoresManager : public nsISupports {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IDOMAPPCORESMANAGER_IID; return iid; }
-
-  NS_IMETHOD    Startup()=0;
-
-  NS_IMETHOD    Shutdown()=0;
-
-  NS_IMETHOD    Add(nsIDOMBaseAppCore* aAppcore)=0;
-
-  NS_IMETHOD    Remove(nsIDOMBaseAppCore* aAppcore)=0;
-
-  NS_IMETHOD    Find(const nsString& aId, nsIDOMBaseAppCore** aReturn)=0;
-};
-
-
-#define NS_DECL_IDOMAPPCORESMANAGER   \
-  NS_IMETHOD    Startup();  \
-  NS_IMETHOD    Shutdown();  \
-  NS_IMETHOD    Add(nsIDOMBaseAppCore* aAppcore);  \
-  NS_IMETHOD    Remove(nsIDOMBaseAppCore* aAppcore);  \
-  NS_IMETHOD    Find(const nsString& aId, nsIDOMBaseAppCore** aReturn);  \
-
-
-
-#define NS_FORWARD_IDOMAPPCORESMANAGER(_to)  \
-  NS_IMETHOD    Startup() { return _to Startup(); }  \
-  NS_IMETHOD    Shutdown() { return _to Shutdown(); }  \
-  NS_IMETHOD    Add(nsIDOMBaseAppCore* aAppcore) { return _to Add(aAppcore); }  \
-  NS_IMETHOD    Remove(nsIDOMBaseAppCore* aAppcore) { return _to Remove(aAppcore); }  \
-  NS_IMETHOD    Find(const nsString& aId, nsIDOMBaseAppCore** aReturn) { return _to Find(aId, aReturn); }  \
-
-
-extern "C" NS_DOM nsresult NS_InitAppCoresManagerClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptAppCoresManager(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMAppCoresManager_h__
--- a/xpfe/AppCores/public/nsIDOMBaseAppCore.h
+++ b/xpfe/AppCores/public/nsIDOMBaseAppCore.h
@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMBaseAppCore_h__
-#define nsIDOMBaseAppCore_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-
-
-#define NS_IDOMBASEAPPCORE_IID \
- { 0xbe5c13bd, 0xba9f, 0x11d2, \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}} 
-
-class nsIDOMBaseAppCore : public nsISupports {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IDOMBASEAPPCORE_IID; return iid; }
-
-  NS_IMETHOD    GetId(nsString& aId)=0;
-
-  NS_IMETHOD    Init(const nsString& aId)=0;
-
-  NS_IMETHOD    SetDocumentCharset(const nsString& aCharset)=0;
-};
-
-
-#define NS_DECL_IDOMBASEAPPCORE   \
-  NS_IMETHOD    GetId(nsString& aId);  \
-  NS_IMETHOD    Init(const nsString& aId);  \
-  NS_IMETHOD    SetDocumentCharset(const nsString& aCharset);  \
-
-
-
-#define NS_FORWARD_IDOMBASEAPPCORE(_to)  \
-  NS_IMETHOD    GetId(nsString& aId) { return _to GetId(aId); } \
-  NS_IMETHOD    Init(const nsString& aId) { return _to Init(aId); }  \
-  NS_IMETHOD    SetDocumentCharset(const nsString& aCharset) { return _to SetDocumentCharset(aCharset); }  \
-
-
-extern "C" NS_DOM nsresult NS_InitBaseAppCoreClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptBaseAppCore(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMBaseAppCore_h__
--- a/xpfe/AppCores/public/nsIDOMBrowserAppCore.h
+++ b/xpfe/AppCores/public/nsIDOMBrowserAppCore.h
@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMBrowserAppCore_h__
-#define nsIDOMBrowserAppCore_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-#include "nsIDOMBaseAppCore.h"
-
-class nsIDOMWindow;
-
-#define NS_IDOMBROWSERAPPCORE_IID \
- { 0xb0ffb697, 0xbab4, 0x11d2, \
-    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}} 
-
-class nsIDOMBrowserAppCore : public nsIDOMBaseAppCore {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IDOMBROWSERAPPCORE_IID; return iid; }
-
-  NS_IMETHOD    Back()=0;
-
-  NS_IMETHOD    Forward()=0;
-
-  NS_IMETHOD    Reload(PRUint32 aReloadType)=0;
-
-  NS_IMETHOD    Stop()=0;
-
-  NS_IMETHOD    LoadUrl(const nsString& aUrl)=0;
-
-  NS_IMETHOD    LoadInitialPage()=0;
-
-  NS_IMETHOD    BackButtonPopup()=0;
-
-  NS_IMETHOD    ForwardButtonPopup()=0;
-
-  NS_IMETHOD    GotoHistoryIndex(PRInt32 aIndex)=0;
-
-  NS_IMETHOD    WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm)=0;
-
-  NS_IMETHOD    CookieViewer(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    SignonViewer(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    WalletEditor(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    WalletChangePassword()=0;
-
-  NS_IMETHOD    WalletQuickFillin(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    WalletRequestToCapture(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    WalletSamples()=0;
-
-  NS_IMETHOD    SetToolbarWindow(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    SetContentWindow(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    SetWebShellWindow(nsIDOMWindow* aWin)=0;
-
-  NS_IMETHOD    NewWindow()=0;
-
-  NS_IMETHOD    OpenWindow()=0;
-
-  NS_IMETHOD    PrintPreview()=0;
-
-  NS_IMETHOD    Copy()=0;
-
-  NS_IMETHOD    Print()=0;
-
-  NS_IMETHOD    Close()=0;
-
-  NS_IMETHOD    Exit()=0;
-
-  NS_IMETHOD    SelectAll()=0;
-
-  NS_IMETHOD    Find()=0;
-
-  NS_IMETHOD    FindNext()=0;
-};
-
-
-#define NS_DECL_IDOMBROWSERAPPCORE   \
-  NS_IMETHOD    Back();  \
-  NS_IMETHOD    Forward();  \
-  NS_IMETHOD    Reload(PRUint32 aReloadType);  \
-  NS_IMETHOD    Stop();  \
-  NS_IMETHOD    LoadUrl(const nsString& aUrl);  \
-  NS_IMETHOD    LoadInitialPage();  \
-  NS_IMETHOD    BackButtonPopup();  \
-  NS_IMETHOD    ForwardButtonPopup();  \
-  NS_IMETHOD    GotoHistoryIndex(PRInt32 aIndex);  \
-  NS_IMETHOD    WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm);  \
-  NS_IMETHOD    CookieViewer(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    SignonViewer(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    WalletEditor(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    WalletChangePassword();  \
-  NS_IMETHOD    WalletQuickFillin(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    WalletRequestToCapture(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    WalletSamples();  \
-  NS_IMETHOD    SetToolbarWindow(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    SetContentWindow(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    SetWebShellWindow(nsIDOMWindow* aWin);  \
-  NS_IMETHOD    NewWindow();  \
-  NS_IMETHOD    OpenWindow();  \
-  NS_IMETHOD    PrintPreview();  \
-  NS_IMETHOD    Copy();  \
-  NS_IMETHOD    Print();  \
-  NS_IMETHOD    Close();  \
-  NS_IMETHOD    Exit();  \
-  NS_IMETHOD    SelectAll();  \
-  NS_IMETHOD    Find();  \
-  NS_IMETHOD    FindNext();  \
-
-
-
-#define NS_FORWARD_IDOMBROWSERAPPCORE(_to)  \
-  NS_IMETHOD    Back() { return _to Back(); }  \
-  NS_IMETHOD    Forward() { return _to Forward(); }  \
-  NS_IMETHOD    Reload(PRUint32 aReloadType) { return _to Reload(aReloadType); }  \
-  NS_IMETHOD    Stop() { return _to Stop(); }  \
-  NS_IMETHOD    LoadUrl(const nsString& aUrl) { return _to LoadUrl(aUrl); }  \
-  NS_IMETHOD    LoadInitialPage() { return _to LoadInitialPage(); }  \
-  NS_IMETHOD    BackButtonPopup() { return _to BackButtonPopup(); }  \
-  NS_IMETHOD    ForwardButtonPopup() { return _to ForwardButtonPopup(); }  \
-  NS_IMETHOD    GotoHistoryIndex(PRInt32 aIndex) { return _to GotoHistoryIndex(aIndex); }  \
-  NS_IMETHOD    WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm) { return _to WalletPreview(aWin, aForm); }  \
-  NS_IMETHOD    CookieViewer(nsIDOMWindow* aWin) { return _to CookieViewer(aWin); }  \
-  NS_IMETHOD    SignonViewer(nsIDOMWindow* aWin) { return _to SignonViewer(aWin); }  \
-  NS_IMETHOD    WalletEditor(nsIDOMWindow* aWin) { return _to WalletEditor(aWin); }  \
-  NS_IMETHOD    WalletChangePassword() { return _to WalletChangePassword(); }  \
-  NS_IMETHOD    WalletQuickFillin(nsIDOMWindow* aWin) { return _to WalletQuickFillin(aWin); }  \
-  NS_IMETHOD    WalletRequestToCapture(nsIDOMWindow* aWin) { return _to WalletRequestToCapture(aWin); }  \
-  NS_IMETHOD    WalletSamples() { return _to WalletSamples(); }  \
-  NS_IMETHOD    SetToolbarWindow(nsIDOMWindow* aWin) { return _to SetToolbarWindow(aWin); }  \
-  NS_IMETHOD    SetContentWindow(nsIDOMWindow* aWin) { return _to SetContentWindow(aWin); }  \
-  NS_IMETHOD    SetWebShellWindow(nsIDOMWindow* aWin) { return _to SetWebShellWindow(aWin); }  \
-  NS_IMETHOD    NewWindow() { return _to NewWindow(); }  \
-  NS_IMETHOD    OpenWindow() { return _to OpenWindow(); }  \
-  NS_IMETHOD    PrintPreview() { return _to PrintPreview(); }  \
-  NS_IMETHOD    Copy() { return _to Copy(); }  \
-  NS_IMETHOD    Print() { return _to Print(); }  \
-  NS_IMETHOD    Close() { return _to Close(); }  \
-  NS_IMETHOD    Exit() { return _to Exit(); }  \
-  NS_IMETHOD    SelectAll() { return _to SelectAll(); }  \
-  NS_IMETHOD    Find() { return _to Find(); }  \
-  NS_IMETHOD    FindNext() { return _to FindNext(); }  \
-
-
-extern "C" NS_DOM nsresult NS_InitBrowserAppCoreClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptBrowserAppCore(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMBrowserAppCore_h__
--- a/xpfe/AppCores/public/nsIDOMToolkitCore.h
+++ b/xpfe/AppCores/public/nsIDOMToolkitCore.h
@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMToolkitCore_h__
-#define nsIDOMToolkitCore_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-#include "nsIDOMBaseAppCore.h"
-
-class nsIDOMWindow;
-
-#define NS_IDOMTOOLKITCORE_IID \
- { 0x1cab9340, 0xc122, 0x11d2, \
-    {0x81, 0xb2, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf}} 
-
-class nsIDOMToolkitCore : public nsIDOMBaseAppCore {
-public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IDOMTOOLKITCORE_IID; return iid; }
-
-  NS_IMETHOD    ShowDialog(const nsString& aUrl, nsIDOMWindow* aParent)=0;
-
-  NS_IMETHOD    ShowWindow(const nsString& aUrl, nsIDOMWindow* aParent)=0;
-
-  NS_IMETHOD    ShowWindowWithArgs(const nsString& aUrl, nsIDOMWindow* aParent, const nsString& aArgs)=0;
-
-  NS_IMETHOD    ShowModalDialog(const nsString& aUrl, nsIDOMWindow* aParent)=0;
-
-  NS_IMETHOD    CloseWindow(nsIDOMWindow* aWindow)=0;
-};
-
-
-#define NS_DECL_IDOMTOOLKITCORE   \
-  NS_IMETHOD    ShowDialog(const nsString& aUrl, nsIDOMWindow* aParent);  \
-  NS_IMETHOD    ShowWindow(const nsString& aUrl, nsIDOMWindow* aParent);  \
-  NS_IMETHOD    ShowWindowWithArgs(const nsString& aUrl, nsIDOMWindow* aParent, const nsString& aArgs);  \
-  NS_IMETHOD    ShowModalDialog(const nsString& aUrl, nsIDOMWindow* aParent);  \
-  NS_IMETHOD    CloseWindow(nsIDOMWindow* aWindow);  \
-
-
-
-#define NS_FORWARD_IDOMTOOLKITCORE(_to)  \
-  NS_IMETHOD    ShowDialog(const nsString& aUrl, nsIDOMWindow* aParent) { return _to ShowDialog(aUrl, aParent); }  \
-  NS_IMETHOD    ShowWindow(const nsString& aUrl, nsIDOMWindow* aParent) { return _to ShowWindow(aUrl, aParent); }  \
-  NS_IMETHOD    ShowWindowWithArgs(const nsString& aUrl, nsIDOMWindow* aParent, const nsString& aArgs) { return _to ShowWindowWithArgs(aUrl, aParent, aArgs); }  \
-  NS_IMETHOD    ShowModalDialog(const nsString& aUrl, nsIDOMWindow* aParent) { return _to ShowModalDialog(aUrl, aParent); }  \
-  NS_IMETHOD    CloseWindow(nsIDOMWindow* aWindow) { return _to CloseWindow(aWindow); }  \
-
-
-extern "C" NS_DOM nsresult NS_InitToolkitCoreClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptToolkitCore(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMToolkitCore_h__
--- a/xpfe/AppCores/src/.cvsignore
+++ b/xpfe/AppCores/src/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/xpfe/AppCores/src/Makefile.in
+++ b/xpfe/AppCores/src/Makefile.in
@ -1,56 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= raptor
-LIBRARY_NAME	= appcores
-
-REQUIRES	= txtsvc
-
-CPPSRCS		= \
-		nsBaseAppCore.cpp \
-		nsAppCoresNameSet.cpp \
-		nsToolkitCore.cpp \
-		nsToolkitCoreFactory.cpp \
-		nsAppCoresManager.cpp \
-		nsAppCoresManagerFactory.cpp \
-		nsJSBaseAppCore.cpp \
-		nsJSAppCoresManager.cpp \
-		nsJSToolkitCore.cpp \
-		nsAppCores.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		-L$(DIST)/bin \
-                $(MOZ_COMPONENT_LIBS) \
-                -lmozjs \
-                -ljsdom \
-                $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/AppCores/src/makefile.win
+++ b/xpfe/AppCores/src/makefile.win
@ -1,250 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-
-
-MAKE_OBJ_TYPE = DLL
-MODULE=appcores
-
-DLL=.\$(OBJDIR)\$(MODULE).dll
-
-DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
-
-LINCS= \
-        -I$(XPDIST)\public\browser      \
-    -I$(XPDIST)\public\txtsvc   \
-    -I$(XPDIST)\public\js       \
-!ifdef NECKO
-	-I$(XPDIST)\public\necko 	\
-!else
-	-I$(XPDIST)\public\netlib 	\
-!endif
-    -I$(XPDIST)\public\network 	\
-	-I$(XPDIST)\public\dom      \
-	-I$(XPDIST)\public\xpcom    \
-	-I$(XPDIST)\public\util	    \
-	-I$(XPDIST)\public\nspr2 	\
-    -I$(XPDIST)\public\pref 	\
-    -I$(XPDIST)\public\profile 	\
-	-I$(XPDIST)\public\raptor   \
-	-I$(XPDIST)\public\appcores \
-	-I$(XPDIST)\public\xpfe\components \
-	-I$(XPDIST)\public\rdf \
-	-I$(XPDIST)\public\wallet \
-    $(NULL)
-
-LLIBS =				            \
- 	$(DIST)\lib\xpcom.lib     \
-    $(DIST)\lib\xppref32.lib    \
-    $(DIST)\lib\js3250.lib      \
-    $(DIST)\lib\jsdombase_s.lib \
-    $(DIST)\lib\jsdomevents_s.lib \
-	$(DIST)\lib\gkgfxwin.lib	\
-    $(DIST)\lib\gkwidget.lib \
-	$(LIBNSPR)		            \
-    $(NULL)
-
-OBJS = \
-    .\$(OBJDIR)\nsBaseAppCore.obj       \
-    .\$(OBJDIR)\nsAppCoresNameSet.obj       \
-    .\$(OBJDIR)\nsToolkitCore.obj        \
-    .\$(OBJDIR)\nsToolkitCoreFactory.obj \
-    .\$(OBJDIR)\nsAppCoresManager.obj       \
-    .\$(OBJDIR)\nsAppCoresManagerFactory.obj       \
-    .\$(OBJDIR)\nsJSBaseAppCore.obj       \
-    .\$(OBJDIR)\nsJSAppCoresManager.obj       \
-    .\$(OBJDIR)\nsJSToolkitCore.obj     \
-    .\$(OBJDIR)\nsAppCores.obj         \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) $(DLL) $(DIST)\bin
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
-
-	$(MAKE_INSTALL) ..\xul\resources\Mail_SendMsg.gif $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\Mail_GetMsg.gif  $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\Mail_Reply.gif   $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\Mail_NewMsg.gif  $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\Mail_Forward.gif $(DIST)\bin\res\toolbar
-
-	$(MAKE_INSTALL) ..\xul\resources\DialogAddrIcon.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogAddrIcon_mo.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogCompIcon.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogCompIcon_mo.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogMailIcon.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogMailIcon_mo.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogNavIcon.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\DialogNavIcon_mo.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Back.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Back_dis.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Back_mo.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Bookmarks.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Bookmarks_mo.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Edit.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Forward.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Forward_dis.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Forward_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Home.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Home_mo.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_HTab.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_HTab_mo.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_LoadImages.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Location.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Location_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_MiniAddr.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_MiniComp.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_MiniMail.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_MiniNav.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_MiniTab.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_MixSecurity.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Netscape.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Netscape_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_PersonalIcon.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Places.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Places_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_popup.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Print.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Print_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Reload.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Reload_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Search.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Search_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Secure.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Secure_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Stop.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Stop_dis.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Stop_mo.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Tab.gif				$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_TabSmall.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_TabSmall_mo.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Tab_mo.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_Unsecure.gif		$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_WhatsRelated.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_WhatsRelated_mo.gif $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\StatusBar-insecure.gif $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\StatusBar-secure.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_NewBack.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_NewForward.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_NewReload.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_NewStop.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_NewHome.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\TB_NewPrint.gif			$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\grippy-horizontal-before.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\grippy-horizontal-after.gif	$(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\grippy-vertical-before.gif	    $(DIST)\bin\res\toolbar
-	$(MAKE_INSTALL) ..\xul\resources\grippy-vertical-after.gif		$(DIST)\bin\res\toolbar
-
-  $(MAKE_INSTALL) ..\xul\resources\throbbingN.gif			$(DIST)\bin\res\throbber
-
-clobber::
-	rm -f $(DIST)\lib\$(MODULE).lib
-	rm -f $(DIST)\bin\$(MODULE).dll
-	rm -f $(DIST)\bin\res\samples\MailAppShell.html
-	rm -f $(DIST)\bin\res\samples\MailAppShellNoTB.html
-	rm -f $(DIST)\bin\res\samples\MailFrame.html
-	rm -f $(DIST)\bin\res\samples\MailToolbar.xml
-	rm -f $(DIST)\bin\res\toolbar\Mail_SendMsg.gif
-	rm -f $(DIST)\bin\res\toolbar\Mail_GetMsg.gif
-	rm -f $(DIST)\bin\res\toolbar\Mail_Reply.gif
-	rm -f $(DIST)\bin\res\toolbar\Mail_NewMsg.gif
-	rm -f $(DIST)\bin\res\toolbar\Mail_Forward.gif
-
-	rm -f $(DIST)\bin\res\samples\DialogAddrIcon.gif		
-	rm -f $(DIST)\bin\res\samples\DialogAddrIcon_mo.gif	
-	rm -f $(DIST)\bin\res\samples\DialogCompIcon.gif		
-	rm -f $(DIST)\bin\res\samples\DialogCompIcon_mo.gif	
-	rm -f $(DIST)\bin\res\samples\DialogMailIcon.gif		
-	rm -f $(DIST)\bin\res\samples\DialogMailIcon_mo.gif	
-	rm -f $(DIST)\bin\res\samples\DialogNavIcon.gif		
-	rm -f $(DIST)\bin\res\samples\DialogNavIcon_mo.gif	
-	rm -f $(DIST)\bin\res\samples\TB_Back.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Back_dis.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Back_mo.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Bookmarks.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Bookmarks_mo.gif	
-	rm -f $(DIST)\bin\res\samples\TB_Edit.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Forward.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Forward_dis.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Forward_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Home.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Home_mo.gif			
-	rm -f $(DIST)\bin\res\samples\TB_HTab.gif			
-	rm -f $(DIST)\bin\res\samples\TB_HTab_mo.gif			
-	rm -f $(DIST)\bin\res\samples\TB_LoadImages.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Location.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Location_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_MiniAddr.gif		
-	rm -f $(DIST)\bin\res\samples\TB_MiniComp.gif		
-	rm -f $(DIST)\bin\res\samples\TB_MiniMail.gif		
-	rm -f $(DIST)\bin\res\samples\TB_MiniNav.gif			
-	rm -f $(DIST)\bin\res\samples\TB_MiniTab.gif			
-	rm -f $(DIST)\bin\res\samples\TB_MixSecurity.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Netscape.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Netscape_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_PersonalIcon.gif	
-	rm -f $(DIST)\bin\res\samples\TB_Places.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Places_mo.gif
-	rm -f $(DIST)\bin\res\samples\TB_popup.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Print.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Print_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Reload.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Reload_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Search.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Search_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Secure.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Secure_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Stop.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Stop_dis.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Stop_mo.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Tab.gif				
-	rm -f $(DIST)\bin\res\samples\TB_TabSmall.gif		
-	rm -f $(DIST)\bin\res\samples\TB_TabSmall_mo.gif		
-	rm -f $(DIST)\bin\res\samples\TB_Tab_mo.gif			
-	rm -f $(DIST)\bin\res\samples\TB_Unsecure.gif		
-	rm -f $(DIST)\bin\res\samples\TB_WhatsRelated.gif	
-	rm -f $(DIST)\bin\res\samples\TB_WhatsRelated_mo.gif 
-	rm -f $(DIST)\bin\res\samples\StatusBar-insecure.gif 
-	rm -f $(DIST)\bin\res\samples\StatusBar-secure.gif	
-	rm -f $(DIST)\bin\res\samples\TB_NewBack.gif	
-	rm -f $(DIST)\bin\res\samples\TB_NewForward.gif	
-	rm -f $(DIST)\bin\res\samples\TB_NewReload.gif	
-	rm -f $(DIST)\bin\res\samples\TB_NewStop.gif	
-	rm -f $(DIST)\bin\res\samples\TB_NewHome.gif	
-	rm -f $(DIST)\bin\res\samples\TB_NewPrint.gif	
-	rm -f $(DIST)\bin\res\toolbar\grippy-horizontal-before.gif	
-	rm -f $(DIST)\bin\res\toolbar\grippy-horizontal-after.gif	
-	rm -f $(DIST)\bin\res\toolbar\grippy-vertical-before.gif	
-	rm -f $(DIST)\bin\res\toolbar\grippy-vertical-after.gif	
-  
-  rm -f $(DIST)\bin\res\throbber\throbbingN.gif
-
--- a/xpfe/AppCores/src/nsAppCores.cpp
+++ b/xpfe/AppCores/src/nsAppCores.cpp
@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <stdio.h>
-
-#include "nsAppCoresCIDs.h"
-#include "nsAppCoresManagerFactory.h"
-#include "nsToolkitCoreFactory.h"
-#include "nsIFactory.h"
-#include "nsIComponentManager.h"
-#include "pratom.h"
-#include "nsIServiceManager.h"
-
-static PRInt32 gLockCnt = 0;
-static PRInt32 gInstanceCnt = 0;
-
-static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
-static NS_DEFINE_IID(kIFactoryIID,        NS_IFACTORY_IID);
-static NS_DEFINE_IID(kToolkitCoreCID,     NS_TOOLKITCORE_CID);
-static NS_DEFINE_IID(kAppCoresManagerCID, NS_APPCORESMANAGER_CID);
-
-
-////////////////////////////////////////////////////////////////////////////////
-// DLL Entry Points:
-////////////////////////////////////////////////////////////////////////////////
-
-extern "C" NS_EXPORT PRBool
-NSCanUnload(nsISupports* serviceMgr)
-{
-    return PRBool (gInstanceCnt == 0 && gLockCnt == 0);
-}
-
-extern "C" NS_EXPORT nsresult
-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(kToolkitCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
-
-    return NS_OK;
-}
-
-extern "C" NS_EXPORT nsresult
-NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
-{
-    printf("*** AppCores object is being unregistered\n");
-    
-    nsComponentManager::UnregisterComponent(kAppCoresManagerCID, path);
-    nsComponentManager::UnregisterComponent(kToolkitCoreCID, path);
-    
-    return NS_OK;
-}
-
-
-
-extern "C" NS_EXPORT nsresult
-NSGetFactory(nsISupports* serviceMgr,
-             const nsCID &aClass,
-             const char *aClassName,
-             const char *aProgID,
-             nsIFactory **aFactory)
-{
-
-    if (aFactory == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aFactory = NULL;
-    nsISupports *inst;
-    if ( aClass.Equals(kAppCoresManagerCID) )
-    {
-        inst = new nsAppCoresManagerFactory();        
-    }
-    else if ( aClass.Equals(kToolkitCoreCID) )
-    {
-        inst = new nsToolkitCoreFactory();
-    }
-    else
-    {
-        return NS_ERROR_ILLEGAL_VALUE;
-    }
-
-
-    if (inst == NULL)
-    {   
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-    NS_ADDREF(inst);  // Stabilize
-    
-    nsresult res = inst->QueryInterface(kIFactoryIID, (void**) aFactory);
-
-    NS_RELEASE(inst); // Destabilize and avoid leaks. Avoid calling delete <interface pointer>    
-
-  return res;
-
-}
-
-extern "C" void
-IncInstanceCount(){
-    PR_AtomicIncrement(&gInstanceCnt);
-}
-
-extern "C" void
-IncLockCount(){
-    PR_AtomicIncrement(&gLockCnt);
-}
-
-extern "C" void
-DecInstanceCount(){
-    PR_AtomicDecrement(&gInstanceCnt);
-}
-
-extern "C" void
-DecLockCount(){
-    PR_AtomicDecrement(&gLockCnt);
-}
--- a/xpfe/AppCores/src/nsAppCores.h
+++ b/xpfe/AppCores/src/nsAppCores.h
@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsAppCores_h___
-#define nsAppCores_h___
-
-#include "nsISupports.h"
-#include "nsIFactory.h"
-#include "nscore.h"
-#include "prio.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// DLL Entry Points:
-////////////////////////////////////////////////////////////////////////////////
-
-extern "C" void
-IncInstanceCount();
-
-extern "C" void
-IncLockCount();
-
-extern "C" void
-DecInstanceCount();
-
-extern "C" void
-DecLockCount();
-
-
-
-
-
-
-
-
-
-
-
-
-#endif 
--- a/xpfe/AppCores/src/nsAppCoresManager.cpp
+++ b/xpfe/AppCores/src/nsAppCoresManager.cpp
@ -1,295 +0,0 @@
-
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsAppCoresManager.h"
-
-#include "nsAppCoresCIDs.h"
-#include "nsAppCores.h"
-#include "nsAppCoresNameSet.h"
-#include "nsIDOMBaseAppCore.h"
-
-#include "nscore.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-
-#include "nsIComponentManager.h"
-
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-
-#include "pratom.h"
-#include "prmem.h"
-#include "prio.h"
-#include "prefapi.h"
-
-#include "nsIURL.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-
-#include "nsIDOMAppCoresManager.h"
-
-/* For Javascript Namespace Access */
-#include "nsDOMCID.h"
-#include "nsIServiceManager.h"
-#include "nsINameSpaceManager.h"
-#include "nsIScriptNameSetRegistry.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsIScriptExternalNameSet.h"
-
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-
-#include "nsIBrowserWindow.h"
-
-// Globals
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-
-static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID);
-static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
-static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
-
-static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
-
-static NS_DEFINE_IID(kBrowserWindowCID, NS_BROWSER_WINDOW_CID);
-static NS_DEFINE_IID(kIBrowserWindowIID, NS_IBROWSER_WINDOW_IID);
-
-static NS_DEFINE_IID(kIAppCoresManagerIID,    NS_IDOMAPPCORESMANAGER_IID); 
-static NS_DEFINE_IID(kAppCoresManagerCID,     NS_APPCORESMANAGER_CID);
-static NS_DEFINE_IID(kAppCoresFactoryCID,     NS_APPCORESFACTORY_CID);
-
-
-/////////////////////////////////////////////////////////////////////////
-// nsAppCoresManager
-/////////////////////////////////////////////////////////////////////////
-
-nsVoidArray nsAppCoresManager::mList;
-
-nsAppCoresManager::nsAppCoresManager()
-{
-  mScriptObject   = nsnull;
-  
-  IncInstanceCount();
-  NS_INIT_REFCNT();
-}
-
-
-//--------------------------------------------------------
-nsAppCoresManager::~nsAppCoresManager()
-{
-  DecInstanceCount(); 
-}
-
-
-NS_IMPL_ADDREF(nsAppCoresManager)
-NS_IMPL_RELEASE(nsAppCoresManager)
-
-
-
-//--------------------------------------------------------
-NS_IMETHODIMP 
-nsAppCoresManager::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-{
-  if (aInstancePtr == NULL) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  // Always NULL result, in case of failure
-  *aInstancePtr = NULL;
-
-  
-  if ( aIID.Equals(kIAppCoresManagerIID) ) {
-    nsIDOMAppCoresManager* tmp = this;
-    *aInstancePtr = (void*)tmp;
-    AddRef();
-    return NS_OK;
-  }
-  else if ( aIID.Equals(kIScriptObjectOwnerIID)) {   
-    nsIScriptObjectOwner* tmp = this;
-    *aInstancePtr = (void*)tmp;
-    AddRef();
-    return NS_OK;
-  }
-  else if ( aIID.Equals(kISupportsIID) ) {
-    nsIDOMAppCoresManager* tmp1 = this;
-    nsISupports* tmp2 = tmp1;
-    
-    *aInstancePtr = (void*)tmp2;
-    AddRef();
-    return NS_OK;
-  }
-
-  return NS_NOINTERFACE;
-}
-
-
-//--------------------------------------------------------
-NS_IMETHODIMP 
-nsAppCoresManager::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
-{
-  nsresult res = NS_OK;
-  
-  if (nsnull == mScriptObject)  {
-    nsIScriptGlobalObject *global = aContext->GetGlobalObject();
-    res = NS_NewScriptAppCoresManager(aContext, (nsISupports *)(nsIDOMAppCoresManager*)this, global, (void**)&mScriptObject);
-    NS_IF_RELEASE(global);
-  }
-
-
-  *aScriptObject = mScriptObject;
-  return res;
-}
-
-//--------------------------------------------------------
-NS_IMETHODIMP 
-nsAppCoresManager::SetScriptObject(void *aScriptObject)
-{
-  mScriptObject = aScriptObject;
-  return NS_OK;
-}
-
-//--------------------------------------------------------
-NS_IMETHODIMP
-nsAppCoresManager::Startup()
-{
-    /***************************************/
-  /* Add us to the Javascript Name Space */
-  /***************************************/
-
-  nsIScriptNameSetRegistry *registry;
-  nsresult result = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
-                                                 kIScriptNameSetRegistryIID,
-                                                (nsISupports **)&registry);
-  if (NS_OK == result) {
-    nsAppCoresNameSet* nameSet = new nsAppCoresNameSet();
-    registry->AddExternalNameSet(nameSet);
-    /* FIX - do we need to release this service?  When we do, it get deleted,and our name is lost. */
-  }
-
-  return result;
-}
-
-/*
-static PRBool CleanUp(void* aElement, void *aData)
-{
-  nsIDOMBaseAppCore * appCore = (nsIDOMBaseAppCore *)aElement;
-  NS_RELEASE(appCore);
-  return PR_TRUE;
-}
-*/
-
-//--------------------------------------------------------
-NS_IMETHODIMP
-nsAppCoresManager::Shutdown()
-{
-  // this won't work, because elements are still in the list when they get
-  // released, and ~nsBaseAppCore tries again to remove them, with bad
-  // results.
-  //mList.EnumerateForwards(CleanUp, nsnull);
-  
-  void*  thisElement;
-  while ((thisElement = mList.ElementAt(0)) != nsnull)
-  {
-    nsIDOMBaseAppCore* thisAppCore = NS_REINTERPRET_CAST(nsIDOMBaseAppCore*, thisElement);
-    Remove(thisAppCore);
-  }
-  
-  return NS_OK;
-}
-
-//--------------------------------------------------------
-NS_IMETHODIMP    
-nsAppCoresManager::Add(nsIDOMBaseAppCore* aAppCore)
-{
-   
-  if (aAppCore == NULL)
-      return NS_ERROR_FAILURE;
-
-  /* Check to see if we already have this task in our list */
-  nsString      nodeIDString;
-  nsString      addIDString;
-
-  aAppCore->GetId(addIDString);
-
-  PRInt32 i;
-  for (i=0;i<mList.Count();i++) {
-    ((nsIDOMBaseAppCore *)mList[i])->GetId(nodeIDString);
-     
-    if (nodeIDString == addIDString) {
-      /*we already have this ID in our list, ignore */
-      return NS_ERROR_FAILURE;    
-    }
-  }
-
-  aAppCore->AddRef();
-  mList.AppendElement(aAppCore);
-
-  return NS_OK;
-}
-
-//--------------------------------------------------------
-NS_IMETHODIMP    
-nsAppCoresManager::Remove(nsIDOMBaseAppCore* aAppCore)
-{
-  // this is fucked up. If you want addreffing, why not use
-  // an nsISupports array? if you don't, why did you addref
-  // in the Add()? So I'm gonna fix this to Release here.
-  if (mList.RemoveElement(aAppCore))
-  {
-    aAppCore->Release();
-    return NS_OK;
-  }
-  
-  return NS_ERROR_FAILURE;
-}
-
-
-
-NS_IMETHODIMP    
-nsAppCoresManager::Find(const nsString& aId, nsIDOMBaseAppCore** aReturn)
-{
-  *aReturn=nsnull;
-
-  nsString nodeIDString;
-
-  PRInt32 i;
-  for (i=0;i<mList.Count();i++) {
-    nsIDOMBaseAppCore * appCore = (nsIDOMBaseAppCore *)mList.ElementAt(i);
-    appCore->GetId(nodeIDString);
-    if (nodeIDString == aId) {
-      NS_ADDREF(appCore);
-      *aReturn = appCore;
-      return NS_OK;    
-    }
-  }
-
-  return NS_OK;
-}
-
-
-
-
-
-
--- a/xpfe/AppCores/src/nsAppCoresManager.h
+++ b/xpfe/AppCores/src/nsAppCoresManager.h
@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsAppCoresManager_h___
-#define nsAppCoresManager_h___
-
-#include "nscore.h"
-#include "nsString.h"
-#include "nsISupports.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIDOMAppCoresManager.h"
-#include "prio.h"
-#include "nsVoidArray.h"
-
-class nsIScriptContext;
-class nsIDOMBaseAppCore;
-
-////////////////////////////////////////////////////////////////////////////////
-// nsAppCoresManager:
-////////////////////////////////////////////////////////////////////////////////
-class nsAppCoresManager : public nsIScriptObjectOwner, public nsIDOMAppCoresManager
-{
-  public:
-
-    nsAppCoresManager();
-    virtual ~nsAppCoresManager();
-       
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-    NS_IMETHOD    SetScriptObject(void* aScriptObject);
-
-    NS_IMETHOD    Startup();
-
-    NS_IMETHOD    Shutdown();
-
-    NS_IMETHOD    Add(nsIDOMBaseAppCore* aAppcore);
-
-    NS_IMETHOD    Remove(nsIDOMBaseAppCore* aAppcore);
-
-    NS_IMETHOD    Find(const nsString& aId, nsIDOMBaseAppCore** aReturn);
-
-  private:
-    void        *mScriptObject;
-    static nsVoidArray  mList;
-
-        
-};
-
-#endif // nsAppCoresManager_h___
--- a/xpfe/AppCores/src/nsAppCoresManagerFactory.cpp
+++ b/xpfe/AppCores/src/nsAppCoresManagerFactory.cpp
@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsAppCoresManagerFactory.h"
-#include "nsAppCoresManager.h"
-#include "nsAppCores.h"
-#include "pratom.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-/////////////////////////////////////////////////////////////////////////
-// nsAppCoresImplFactory
-/////////////////////////////////////////////////////////////////////////
-
-nsAppCoresManagerFactory::nsAppCoresManagerFactory(void)
-{
-    mRefCnt=0;
-    IncInstanceCount();
-}
-
-nsAppCoresManagerFactory::~nsAppCoresManagerFactory(void)
-{
-    IncInstanceCount();
-}
-
-
-
-NS_IMETHODIMP 
-nsAppCoresManagerFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-{
-    if (aInstancePtr == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
-
-    if ( aIID.Equals(kISupportsIID) )
-    {
-        *aInstancePtr = (void*) this;
-    }
-    else if ( aIID.Equals(kIFactoryIID) )
-    {
-        *aInstancePtr = (void*) this;
-    }
-
-    if (aInstancePtr == NULL)
-    {
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    AddRef();
-    return NS_OK;
-}
-
-
-
-NS_IMPL_ADDREF(nsAppCoresManagerFactory)
-NS_IMPL_RELEASE(nsAppCoresManagerFactory)
-
-
-NS_IMETHODIMP
-nsAppCoresManagerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aResult == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aResult = NULL;
-
-    /* do I have to use iSupports? */
-    nsAppCoresManager *inst = new nsAppCoresManager();
-
-    if (inst == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult result =  inst->QueryInterface(aIID, aResult);
-
-    if (result != NS_OK)
-        delete inst;
-
-    return result;
-
-}
-
-NS_IMETHODIMP
-nsAppCoresManagerFactory::LockFactory(PRBool aLock)
-{
-    if (aLock)
-        IncLockCount();
-    else
-        DecLockCount();
-
-    return NS_OK;
-}
--- a/xpfe/AppCores/src/nsAppCoresManagerFactory.h
+++ b/xpfe/AppCores/src/nsAppCoresManagerFactory.h
@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsAppCoresManagerFactory_h___
-#define nsAppCoresManagerFactory_h___
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// nsAppCoresManagerFactory:
-////////////////////////////////////////////////////////////////////////////////
-
-class nsAppCoresManagerFactory : public nsIFactory 
-{
-    public:
-        
-        nsAppCoresManagerFactory();
-        virtual ~nsAppCoresManagerFactory();
-        
-        PRBool CanUnload(void);
-
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                  REFNSIID aIID,
-                                  void **aResult);
-
-        NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-#endif // nsAppCoresManagerFactory_h___
--- a/xpfe/AppCores/src/nsAppCoresNameSet.cpp
+++ b/xpfe/AppCores/src/nsAppCoresNameSet.cpp
@ -1,93 +0,0 @@
-
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-////////////////////////////////////////////////////////////////////////////////
-// nsAppCoresNameSet
-////////////////////////////////////////////////////////////////////////////////
-#include "nsAppCoresNameSet.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsIDOMAppCoresManager.h"
-#include "nsIDOMToolkitCore.h"
-#include "nsIDOMBrowserAppCore.h"
-#include "nsAppCoresCIDs.h" 
-
-
-static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
-static NS_DEFINE_IID(kAppCoresCID,           NS_APPCORESMANAGER_CID);
-static NS_DEFINE_IID(kToolkitCoreCID,        NS_TOOLKITCORE_CID);
-
-nsAppCoresNameSet::nsAppCoresNameSet()
-{
-  NS_INIT_REFCNT();
-}
-
-nsAppCoresNameSet::~nsAppCoresNameSet()
-{
-}
-
-NS_IMPL_ISUPPORTS(nsAppCoresNameSet, kIScriptExternalNameSetIID);
-
-
-
-
-NS_IMETHODIMP
-nsAppCoresNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
-{
-    nsresult result = NS_OK;
-
-    result = NS_InitAppCoresManagerClass(aScriptContext, nsnull);
-    if (NS_OK != result) return result;
-
-    result = NS_InitToolkitCoreClass(aScriptContext, nsnull);
-
-    return result;
-}
-
-
-
-
-NS_IMETHODIMP
-nsAppCoresNameSet::AddNameSet(nsIScriptContext* aScriptContext)
-{
-    nsresult result = NS_OK;
-    nsIScriptNameSpaceManager* manager;
-
-    result = aScriptContext->GetNameSpaceManager(&manager);
-    if (NS_OK == result) 
-    {
-        result = manager->RegisterGlobalName("ToolkitCore",
-                                             kToolkitCoreCID,
-                                             PR_TRUE);
-
-        if (NS_OK != result) return result;
-
-        result = manager->RegisterGlobalName("XPAppCoresManager", 
-                                             kAppCoresCID, 
-                                             PR_FALSE);
-        
-        NS_RELEASE(manager);
-    }
-    return result;
-}
-
--- a/xpfe/AppCores/src/nsAppCoresNameSet.h
+++ b/xpfe/AppCores/src/nsAppCoresNameSet.h
@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsAppCoresNameSet_h___
-#define nsAppCoresNameSet_h___
-
-#include "nsISupports.h"
-#include "nsIScriptExternalNameSet.h"
-
-class nsIScriptContext;
-
-////////////////////////////////////////////////////////////////////////////////
-// nsAppCoresNameSet:
-////////////////////////////////////////////////////////////////////////////////
-
-class nsAppCoresNameSet : public nsIScriptExternalNameSet 
-{
-    public:
-        nsAppCoresNameSet();
-        virtual ~nsAppCoresNameSet();
-
-        NS_DECL_ISUPPORTS
-        NS_IMETHOD InitializeClasses(nsIScriptContext* aScriptContext);
-        NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
-};
-
-#endif // nsAppCoresNameSet_h___
--- a/xpfe/AppCores/src/nsBaseAppCore.cpp
+++ b/xpfe/AppCores/src/nsBaseAppCore.cpp
@ -1,216 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-#include "nsBaseAppCore.h"
-#include "nsAppCoresManager.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMElement.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIDOMWindow.h"
-#include "nsIDocument.h"
-#include "nsAppCoresCIDs.h"
-#include "nsIServiceManager.h"
-
-// Globals
-static NS_DEFINE_IID(kIScriptObjectOwnerIID,     NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIDOMAppCoresManagerIID,   NS_IDOMAPPCORESMANAGER_IID);
-static NS_DEFINE_IID(kAppCoresManagerCID,       NS_APPCORESMANAGER_CID);
-
-/////////////////////////////////////////////////////////////////////////
-// nsBaseAppCore
-/////////////////////////////////////////////////////////////////////////
-
-nsBaseAppCore::nsBaseAppCore()
-:  mScriptObject(nsnull)
-{
-    IncInstanceCount();
-    NS_INIT_REFCNT();
-}
-
-nsBaseAppCore::~nsBaseAppCore()
-{
-    nsIDOMAppCoresManager * appCoreManager;
-    nsresult rv = nsServiceManager::GetService(
-        kAppCoresManagerCID,
-        kIDOMAppCoresManagerIID,
-        (nsISupports**)&appCoreManager);
-    if (NS_FAILED(rv))
-        return;
-        
-    // because the appcores manager list holds references, we should
-    // never still be in the list now. So this will always fail.
-    appCoreManager->Remove((nsIDOMBaseAppCore *)this);
-    
-    nsServiceManager::ReleaseService(kAppCoresManagerCID, appCoreManager);
-
-    DecInstanceCount();  
-}
-
-
-NS_IMPL_ADDREF(nsBaseAppCore)
-NS_IMPL_RELEASE(nsBaseAppCore)
-
-
-NS_IMETHODIMP 
-nsBaseAppCore::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-{
-  if (aInstancePtr == NULL) {
-      return NS_ERROR_NULL_POINTER;
-  }
-
-  // Always NULL result, in case of failure
-  *aInstancePtr = NULL;
-
-  if ( aIID.Equals(kIScriptObjectOwnerIID)) {
-      *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
-      AddRef();
-      return NS_OK;
-  }
-  if ( aIID.Equals(NS_GET_IID(nsIDOMBaseAppCore))) {
-      *aInstancePtr = (void*) ((nsIDOMBaseAppCore*)this);
-      AddRef();
-      return NS_OK;
-  }
-  else if ( aIID.Equals(NS_GET_IID(nsISupports)) ) {
-      *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
-      AddRef();
-      return NS_OK;
-  }
-
-   return NS_NOINTERFACE;
-}
-
-NS_IMETHODIMP 
-nsBaseAppCore::SetScriptObject(void *aScriptObject)
-{
-  mScriptObject = aScriptObject;
-  return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsBaseAppCore::Init(const nsString& aId)
-{   
-	mId = aId;
-
-	// this used to be in the constructor of the base class, but
-	// nsIAppCoreManager::Add requires that the app core being added
-	// has a id. So we can't do it until the app core has been initialized
-
-#ifdef NS_DEBUG
-    printf("Adding app core to AppCoreManager in the base initialization.\n");
-#endif
-    nsIDOMAppCoresManager * appCoreManager;
-    nsresult rv = nsServiceManager::GetService(
-        kAppCoresManagerCID,
-        kIDOMAppCoresManagerIID,
-        (nsISupports**)&appCoreManager);
-    if (NS_FAILED(rv))
-        return rv;
-    rv = appCoreManager->Add((nsIDOMBaseAppCore *)this);
-#ifdef NS_DEBUG
-    if (NS_FAILED(rv))
-	    printf("...failed!\n");
-#endif
-    nsServiceManager::ReleaseService(kAppCoresManagerCID, appCoreManager);
-	return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsBaseAppCore::GetId(nsString& aId)
-{
-    aId = mId;
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsBaseAppCore::SetDocumentCharset(const nsString& aCharset)
-{
-  return NS_OK;
-}
-
-//----------------------------------------
-nsIScriptContext *    
-nsBaseAppCore::GetScriptContext(nsIDOMWindow * aWin)
-{
-  nsIScriptContext * scriptContext = nsnull;
-  if (nsnull != aWin) {
-    nsCOMPtr<nsIScriptGlobalObject> global(do_QueryInterface(aWin));
-    if (!NS_WARN_IF_FALSE(global, "This should succeed")) {
-      global->GetContext(&scriptContext);
-    }
-  }
-
-  return scriptContext;
-}
-
-//----------------------------------------
-nsCOMPtr<nsIDOMNode> nsBaseAppCore::FindNamedDOMNode(const nsString &aName, nsIDOMNode * aParent, PRInt32 & aCount, PRInt32 aEndCount)
-{
-  nsCOMPtr<nsIDOMNode> node;
-
-  if (nsnull == aParent) {
-    return node;
-	}
-
-  aParent->GetFirstChild(getter_AddRefs(node));
-  while (node) {
-    nsString name;
-    node->GetNodeName(name);
-    //printf("FindNamedDOMNode[%s] %d == %d\n", name.ToNewCString(), aCount, aEndCount);
-    if (name.Equals(aName)) {
-      aCount++;
-      if (aCount == aEndCount)
-        return node;
-    }
-    PRBool hasChildren;
-    node->HasChildNodes(&hasChildren);
-    if (hasChildren) {
-      nsCOMPtr<nsIDOMNode> found(FindNamedDOMNode(aName, node, aCount, aEndCount));
-      if (found)
-        return found;
-    }
-    nsCOMPtr<nsIDOMNode> oldNode = node;
-    oldNode->GetNextSibling(getter_AddRefs(node));
-  }
-  node = do_QueryInterface(nsnull);
-  return node;
-
-} // nsToolbarCore::FindNamedDOMNode
-
-//----------------------------------------
-nsCOMPtr<nsIDOMNode> nsBaseAppCore::GetParentNodeFromDOMDoc(nsIDOMDocument * aDOMDoc)
-{
-  nsCOMPtr<nsIDOMNode> node; // null
-
-  if (nsnull == aDOMDoc) {
-    return node;
-  }
-
-  nsCOMPtr<nsIDOMElement> element;
-  aDOMDoc->GetDocumentElement(getter_AddRefs(element));
-  if (element)
-    return nsCOMPtr<nsIDOMNode>(do_QueryInterface(element));
-  return node;
-} // nsToolbarCore::GetParentNodeFromDOMDoc
--- a/xpfe/AppCores/src/nsBaseAppCore.h
+++ b/xpfe/AppCores/src/nsBaseAppCore.h
@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsBaseAppCore_h___
-#define nsBaseAppCore_h___
-
-#include "nsAppCores.h"
-
-//#include "nscore.h"
-#include "nsString.h"
-#include "nsISupports.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIDOMBaseAppCore.h"
-#include "nsCOMPtr.h"
-
-// Cannot forward declare a class used with an nsCOMPtr.
-// see: http://www.mozilla.org/projects/xpcom/nsCOMPtr.html
-// class nsIDOMNode;
-
-#include "nsIDOMNode.h"
-
-class nsIDOMDocument;
-class nsIScriptContext;
-class nsIDOMWindow;
-
-////////////////////////////////////////////////////////////////////////////////
-// nsBaseAppCore:
-////////////////////////////////////////////////////////////////////////////////
-
-class nsBaseAppCore : public nsIScriptObjectOwner, public nsIDOMBaseAppCore
-{
-  public:
-
-    nsBaseAppCore();
-    virtual ~nsBaseAppCore();
-                 
-
-    NS_DECL_ISUPPORTS
-    //NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-    NS_IMETHOD    SetScriptObject(void* aScriptObject);
-
-    NS_IMETHOD    Init(const nsString& aId);
-    NS_IMETHOD    GetId(nsString& aId);
-    NS_IMETHOD    SetDocumentCharset(const nsString& aCharset);
-
-  protected:
-    nsCOMPtr<nsIDOMNode>     FindNamedDOMNode(const nsString &aName, nsIDOMNode * aParent, PRInt32 & aCount, PRInt32 aEndCount);
-    nsCOMPtr<nsIDOMNode>     GetParentNodeFromDOMDoc(nsIDOMDocument * aDOMDoc);
-    nsIScriptContext *       GetScriptContext(nsIDOMWindow * aWin);
-
-    nsString  mId;         /* User ID */
-    void     *mScriptObject;
-};
-
-#endif // nsBaseAppCore_h___
--- a/xpfe/AppCores/src/nsCookieCoreFactory.cpp
+++ b/xpfe/AppCores/src/nsCookieCoreFactory.cpp
@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsCookieCoreFactory.h"
-
-#include "nsAppCores.h"
-#include "nsCookieCore.h"
-#include "pratom.h"
-#include "nsISupportsUtils.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-//----------------------------------------------------------------------------------------
-nsCookieCoreFactory::nsCookieCoreFactory()
-//----------------------------------------------------------------------------------------
-{
-    NS_INIT_REFCNT();
-    IncInstanceCount();
-}
-
-//----------------------------------------------------------------------------------------
-nsCookieCoreFactory::~nsCookieCoreFactory()
-//----------------------------------------------------------------------------------------
-{
-    DecInstanceCount();
-}
-
-NS_IMPL_ADDREF(nsCookieCoreFactory)
-NS_IMPL_RELEASE(nsCookieCoreFactory)
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsCookieCoreFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-//----------------------------------------------------------------------------------------
-{
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
-
-    if ( aIID.Equals(kISupportsIID) )
-        *aInstancePtr = (void*) this;
-    else if ( aIID.Equals(kIFactoryIID) )
-        *aInstancePtr = (void*) this;
-
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NO_INTERFACE;
-
-    AddRef();
-    return NS_OK;
-} // nsCookieCoreFactory::QueryInterface
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsCookieCoreFactory::CreateInstance(
-    nsISupports* aOuter,
-    REFNSIID aIID,
-    void **aResult)
-//----------------------------------------------------------------------------------------
-{
-    if (aResult == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    *aResult = NULL;
-
-#if 0
-    // There is a stupid bug that I don't feel competent to fix. Basically, the
-    // AppCore Manager is a waste of time (the manager gets created, an app core is
-    // added to the list, and then the app core manager is deleted, along with its list).
-    // I want to insist that
-    // there is always one instance of the Cookie app core. Hence this HACK.
-    static nsCookieCore* inst = nsnull;
-    PRBool firstTime = (inst == nsnull);
-    if (firstTime)
-    {
-        inst = new nsCookieCore();
-        if (!inst)
-            return NS_ERROR_OUT_OF_MEMORY;
-        NS_ADDREF(inst);
-    }
-	nsresult result =  inst->QueryInterface(aIID, aResult);
-	if (result != NS_OK && firstTime)
-	    NS_RELEASE(inst);
-#else
-    static nsCookieCore* inst = new nsCookieCore();
-    if (!inst)
-        return NS_ERROR_OUT_OF_MEMORY;
-	nsresult result =  inst->QueryInterface(aIID, aResult);
-#endif
-    return result;
-} // nsCookieCoreFactory::CreateInstance
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsCookieCoreFactory::LockFactory(PRBool aLock)
-//----------------------------------------------------------------------------------------
-{
-    if (aLock)
-        IncLockCount();
-    else
-        DecLockCount();
-    return NS_OK;
-} // nsCookieCoreFactory::LockFactory
--- a/xpfe/AppCores/src/nsCookieCoreFactory.h
+++ b/xpfe/AppCores/src/nsCookieCoreFactory.h
@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsCookieCoreFactory_h___
-#define nsCookieCoreFactory_h___
-
-//#include "nscore.h"
-//#include "nsString.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-
-//========================================================================================
-class nsCookieCoreFactory : public nsIFactory 
-//========================================================================================
-{
-    public:
-        
-        nsCookieCoreFactory();
-        virtual ~nsCookieCoreFactory();
-        
-        PRBool CanUnload(void);
-
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                      REFNSIID aIID,
-                                      void **aResult);
-
-        NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-#endif // nsCookieCoreFactory_h___
--- a/xpfe/AppCores/src/nsJSAppCoresManager.cpp
+++ b/xpfe/AppCores/src/nsJSAppCoresManager.cpp
@ -1,536 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nsDOMError.h"
-#include "nscore.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsCOMPtr.h"
-#include "nsDOMPropEnums.h"
-#include "nsString.h"
-#include "nsIDOMAppCoresManager.h"
-#include "nsIDOMBaseAppCore.h"
-
-
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
-static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIAppCoresManagerIID, NS_IDOMAPPCORESMANAGER_IID);
-static NS_DEFINE_IID(kIBaseAppCoreIID, NS_IDOMBASEAPPCORE_IID);
-
-
-/***********************************************************************/
-//
-// AppCoresManager Properties Getter
-//
-PR_STATIC_CALLBACK(JSBool)
-GetAppCoresManagerProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMAppCoresManager *a = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
-    }
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-/***********************************************************************/
-//
-// AppCoresManager Properties Setter
-//
-PR_STATIC_CALLBACK(JSBool)
-SetAppCoresManagerProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMAppCoresManager *a = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
-    }
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-
-//
-// AppCoresManager finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeAppCoresManager(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-
-//
-// AppCoresManager enumerate
-//
-PR_STATIC_CALLBACK(JSBool)
-EnumerateAppCoresManager(JSContext *cx, JSObject *obj)
-{
-  return nsJSUtils::nsGenericEnumerate(cx, obj);
-}
-
-
-//
-// AppCoresManager resolve
-//
-PR_STATIC_CALLBACK(JSBool)
-ResolveAppCoresManager(JSContext *cx, JSObject *obj, jsval id)
-{
-  return nsJSUtils::nsGenericResolve(cx, obj, id);
-}
-
-
-//
-// Native method Startup
-//
-PR_STATIC_CALLBACK(JSBool)
-AppCoresManagerStartup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMAppCoresManager *nativeThis = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_STARTUP, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-
-    result = nativeThis->Startup();
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method Shutdown
-//
-PR_STATIC_CALLBACK(JSBool)
-AppCoresManagerShutdown(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMAppCoresManager *nativeThis = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_SHUTDOWN, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-
-    result = nativeThis->Shutdown();
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method Add
-//
-PR_STATIC_CALLBACK(JSBool)
-AppCoresManagerAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMAppCoresManager *nativeThis = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsCOMPtr<nsIDOMBaseAppCore> b0;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_ADD, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 1) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b0),
-                                           kIBaseAppCoreIID,
-                                           "BaseAppCore",
-                                           cx,
-                                           argv[0])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-
-    result = nativeThis->Add(b0);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method Remove
-//
-PR_STATIC_CALLBACK(JSBool)
-AppCoresManagerRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMAppCoresManager *nativeThis = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsCOMPtr<nsIDOMBaseAppCore> b0;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_REMOVE, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 1) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b0),
-                                           kIBaseAppCoreIID,
-                                           "BaseAppCore",
-                                           cx,
-                                           argv[0])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-
-    result = nativeThis->Remove(b0);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method Find
-//
-PR_STATIC_CALLBACK(JSBool)
-AppCoresManagerFind(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMAppCoresManager *nativeThis = (nsIDOMAppCoresManager*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsIDOMBaseAppCore* nativeRet;
-  nsAutoString b0;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_FIND, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 1) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-
-    result = nativeThis->Find(b0, &nativeRet);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, obj, rval);
-  }
-
-  return JS_TRUE;
-}
-
-
-/***********************************************************************/
-//
-// class for AppCoresManager
-//
-JSClass AppCoresManagerClass = {
-  "AppCoresManager", 
-  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  GetAppCoresManagerProperty,
-  SetAppCoresManagerProperty,
-  EnumerateAppCoresManager,
-  ResolveAppCoresManager,
-  JS_ConvertStub,
-  FinalizeAppCoresManager,
-  nsnull,
-  nsJSUtils::nsCheckAccess
-};
-
-
-//
-// AppCoresManager class properties
-//
-static JSPropertySpec AppCoresManagerProperties[] =
-{
-  {0}
-};
-
-
-//
-// AppCoresManager class methods
-//
-static JSFunctionSpec AppCoresManagerMethods[] = 
-{
-  {"Startup",          AppCoresManagerStartup,     0},
-  {"Shutdown",          AppCoresManagerShutdown,     0},
-  {"Add",          AppCoresManagerAdd,     1},
-  {"Remove",          AppCoresManagerRemove,     1},
-  {"Find",          AppCoresManagerFind,     1},
-  {0}
-};
-
-
-//
-// AppCoresManager constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-AppCoresManager(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_FALSE;
-}
-
-
-//
-// AppCoresManager class initialization
-//
-extern "C" NS_DOM nsresult NS_InitAppCoresManagerClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = nsnull;
-  JSObject *parent_proto = nsnull;
-  JSObject *global = JS_GetGlobalObject(jscontext);
-  jsval vp;
-
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "AppCoresManager", &vp)) ||
-      !JSVAL_IS_OBJECT(vp) ||
-      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
-      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) {
-
-    proto = JS_InitClass(jscontext,     // context
-                         global,        // global object
-                         parent_proto,  // parent proto 
-                         &AppCoresManagerClass,      // JSClass
-                         AppCoresManager,            // JSNative ctor
-                         0,             // ctor args
-                         AppCoresManagerProperties,  // proto props
-                         AppCoresManagerMethods,     // proto funcs
-                         nsnull,        // ctor props (static)
-                         nsnull);       // ctor funcs (static)
-    if (nsnull == proto) {
-      return NS_ERROR_FAILURE;
-    }
-
-  }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
-    proto = JSVAL_TO_OBJECT(vp);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aPrototype) {
-    *aPrototype = proto;
-  }
-  return NS_OK;
-}
-
-
-//
-// Method for creating a new AppCoresManager JavaScript object
-//
-extern "C" NS_DOM nsresult NS_NewScriptAppCoresManager(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
-{
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptAppCoresManager");
-  JSObject *proto;
-  JSObject *parent;
-  nsIScriptObjectOwner *owner;
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  nsresult result = NS_OK;
-  nsIDOMAppCoresManager *aAppCoresManager;
-
-  if (nsnull == aParent) {
-    parent = nsnull;
-  }
-  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
-    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
-      NS_RELEASE(owner);
-      return NS_ERROR_FAILURE;
-    }
-    NS_RELEASE(owner);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (NS_OK != NS_InitAppCoresManagerClass(aContext, (void **)&proto)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  result = aSupports->QueryInterface(kIAppCoresManagerIID, (void **)&aAppCoresManager);
-  if (NS_OK != result) {
-    return result;
-  }
-
-  // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &AppCoresManagerClass, proto, parent);
-  if (nsnull != *aReturn) {
-    // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aAppCoresManager);
-  }
-  else {
-    NS_RELEASE(aAppCoresManager);
-    return NS_ERROR_FAILURE; 
-  }
-
-  return NS_OK;
-}
--- a/xpfe/AppCores/src/nsJSBaseAppCore.cpp
+++ b/xpfe/AppCores/src/nsJSBaseAppCore.cpp
@ -1,467 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nsDOMError.h"
-#include "nscore.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsCOMPtr.h"
-#include "nsDOMPropEnums.h"
-#include "nsString.h"
-#include "nsIDOMBaseAppCore.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIJSNativeInitializer.h"
-#include "nsDOMCID.h"
-
-
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
-static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIBaseAppCoreIID, NS_IDOMBASEAPPCORE_IID);
-
-//
-// BaseAppCore property ids
-//
-enum BaseAppCore_slots {
-  BASEAPPCORE_ID = -1
-};
-
-/***********************************************************************/
-//
-// BaseAppCore Properties Getter
-//
-PR_STATIC_CALLBACK(JSBool)
-GetBaseAppCoreProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMBaseAppCore *a = (nsIDOMBaseAppCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
-    }
-    switch(JSVAL_TO_INT(id)) {
-      case BASEAPPCORE_ID:
-      {
-        rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_ID, PR_FALSE);
-        if (NS_FAILED(rv)) {
-          return nsJSUtils::nsReportError(cx, obj, rv);
-        }
-        nsAutoString prop;
-        nsresult result = NS_OK;
-        result = a->GetId(prop);
-        if (NS_SUCCEEDED(result)) {
-          nsJSUtils::nsConvertStringToJSVal(prop, cx, vp);
-        }
-        else {
-          return nsJSUtils::nsReportError(cx, obj, result);
-        }
-        break;
-      }
-      default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-/***********************************************************************/
-//
-// BaseAppCore Properties Setter
-//
-PR_STATIC_CALLBACK(JSBool)
-SetBaseAppCoreProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMBaseAppCore *a = (nsIDOMBaseAppCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
-    }
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-
-//
-// BaseAppCore finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeBaseAppCore(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-
-//
-// BaseAppCore enumerate
-//
-PR_STATIC_CALLBACK(JSBool)
-EnumerateBaseAppCore(JSContext *cx, JSObject *obj)
-{
-  return nsJSUtils::nsGenericEnumerate(cx, obj);
-}
-
-
-//
-// BaseAppCore resolve
-//
-PR_STATIC_CALLBACK(JSBool)
-ResolveBaseAppCore(JSContext *cx, JSObject *obj, jsval id)
-{
-  return nsJSUtils::nsGenericResolve(cx, obj, id);
-}
-
-
-//
-// Native method Init
-//
-PR_STATIC_CALLBACK(JSBool)
-BaseAppCoreInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMBaseAppCore *nativeThis = (nsIDOMBaseAppCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsAutoString b0;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_INIT, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 1) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-
-    result = nativeThis->Init(b0);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method SetDocumentCharset
-//
-PR_STATIC_CALLBACK(JSBool)
-BaseAppCoreSetDocumentCharset(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMBaseAppCore *nativeThis = (nsIDOMBaseAppCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsAutoString b0;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_SETDOCUMENTCHARSET, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 1) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-
-    result = nativeThis->SetDocumentCharset(b0);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-/***********************************************************************/
-//
-// class for BaseAppCore
-//
-JSClass BaseAppCoreClass = {
-  "BaseAppCore", 
-  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  GetBaseAppCoreProperty,
-  SetBaseAppCoreProperty,
-  EnumerateBaseAppCore,
-  ResolveBaseAppCore,
-  JS_ConvertStub,
-  FinalizeBaseAppCore,
-  nsnull,
-  nsJSUtils::nsCheckAccess
-};
-
-
-//
-// BaseAppCore class properties
-//
-static JSPropertySpec BaseAppCoreProperties[] =
-{
-  {"id",    BASEAPPCORE_ID,    JSPROP_ENUMERATE | JSPROP_READONLY},
-  {0}
-};
-
-
-//
-// BaseAppCore class methods
-//
-static JSFunctionSpec BaseAppCoreMethods[] = 
-{
-  {"Init",          BaseAppCoreInit,     1},
-  {"SetDocumentCharset",          BaseAppCoreSetDocumentCharset,     1},
-  {0}
-};
-
-
-//
-// BaseAppCore constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-BaseAppCore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsresult result;
-  nsIID classID;
-  nsIDOMBaseAppCore *nativeThis;
-  nsIScriptObjectOwner *owner = nsnull;
-  nsIJSNativeInitializer* initializer = nsnull;
-
-  static NS_DEFINE_IID(kIDOMBaseAppCoreIID, NS_IDOMBASEAPPCORE_IID);
-  static NS_DEFINE_IID(kIJSNativeInitializerIID, NS_IJSNATIVEINITIALIZER_IID);
-
-  nsCOMPtr<nsIScriptContext> scriptCX;
-  nsJSUtils::nsGetStaticScriptContext(cx, obj, getter_AddRefs(scriptCX));
-  if (!scriptCX) {
-    return JS_FALSE;
-  }
-
-  nsCOMPtr<nsIScriptNameSpaceManager> manager;
-  scriptCX->GetNameSpaceManager(getter_AddRefs(manager));
-  if (!manager) {
-    return JS_FALSE;
-  }
-
-  result = manager->LookupName("BaseAppCore", PR_TRUE, classID);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  result = nsComponentManager::CreateInstance(classID,
-                                        nsnull,
-                                        kIDOMBaseAppCoreIID,
-                                        (void **)&nativeThis);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  result = nativeThis->QueryInterface(kIJSNativeInitializerIID, (void **)&initializer);
-  if (NS_OK == result) {
-    result = initializer->Initialize(cx, obj, argc, argv);
-    NS_RELEASE(initializer);
-
-    if (NS_OK != result) {
-      NS_RELEASE(nativeThis);
-      return JS_FALSE;
-    }
-  }
-
-  result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-  if (NS_OK != result) {
-    NS_RELEASE(nativeThis);
-    return JS_FALSE;
-  }
-
-  owner->SetScriptObject((void *)obj);
-  JS_SetPrivate(cx, obj, nativeThis);
-
-  NS_RELEASE(owner);
-  return JS_TRUE;
-}
-
-//
-// BaseAppCore class initialization
-//
-extern "C" NS_DOM nsresult NS_InitBaseAppCoreClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = nsnull;
-  JSObject *parent_proto = nsnull;
-  JSObject *global = JS_GetGlobalObject(jscontext);
-  jsval vp;
-
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "BaseAppCore", &vp)) ||
-      !JSVAL_IS_OBJECT(vp) ||
-      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
-      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) {
-
-    proto = JS_InitClass(jscontext,     // context
-                         global,        // global object
-                         parent_proto,  // parent proto 
-                         &BaseAppCoreClass,      // JSClass
-                         BaseAppCore,            // JSNative ctor
-                         0,             // ctor args
-                         BaseAppCoreProperties,  // proto props
-                         BaseAppCoreMethods,     // proto funcs
-                         nsnull,        // ctor props (static)
-                         nsnull);       // ctor funcs (static)
-    if (nsnull == proto) {
-      return NS_ERROR_FAILURE;
-    }
-
-  }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
-    proto = JSVAL_TO_OBJECT(vp);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aPrototype) {
-    *aPrototype = proto;
-  }
-  return NS_OK;
-}
-
-
-//
-// Method for creating a new BaseAppCore JavaScript object
-//
-extern "C" NS_DOM nsresult NS_NewScriptBaseAppCore(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
-{
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptBaseAppCore");
-  JSObject *proto;
-  JSObject *parent;
-  nsIScriptObjectOwner *owner;
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  nsresult result = NS_OK;
-  nsIDOMBaseAppCore *aBaseAppCore;
-
-  if (nsnull == aParent) {
-    parent = nsnull;
-  }
-  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
-    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
-      NS_RELEASE(owner);
-      return NS_ERROR_FAILURE;
-    }
-    NS_RELEASE(owner);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (NS_OK != NS_InitBaseAppCoreClass(aContext, (void **)&proto)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  result = aSupports->QueryInterface(kIBaseAppCoreIID, (void **)&aBaseAppCore);
-  if (NS_OK != result) {
-    return result;
-  }
-
-  // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &BaseAppCoreClass, proto, parent);
-  if (nsnull != *aReturn) {
-    // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aBaseAppCore);
-  }
-  else {
-    NS_RELEASE(aBaseAppCore);
-    return NS_ERROR_FAILURE; 
-  }
-
-  return NS_OK;
-}
--- a/xpfe/AppCores/src/nsJSToolkitCore.cpp
+++ b/xpfe/AppCores/src/nsJSToolkitCore.cpp
@ -1,636 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nsDOMError.h"
-#include "nscore.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIJSScriptObject.h"
-#include "nsIScriptObjectOwner.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsCOMPtr.h"
-#include "nsDOMPropEnums.h"
-#include "nsString.h"
-#include "nsIDOMToolkitCore.h"
-#include "nsIDOMWindow.h"
-#include "nsIScriptNameSpaceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIJSNativeInitializer.h"
-#include "nsDOMCID.h"
-
-
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
-static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIToolkitCoreIID, NS_IDOMTOOLKITCORE_IID);
-static NS_DEFINE_IID(kIWindowIID, NS_IDOMWINDOW_IID);
-
-
-/***********************************************************************/
-//
-// ToolkitCore Properties Getter
-//
-PR_STATIC_CALLBACK(JSBool)
-GetToolkitCoreProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMToolkitCore *a = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
-    }
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-/***********************************************************************/
-//
-// ToolkitCore Properties Setter
-//
-PR_STATIC_CALLBACK(JSBool)
-SetToolkitCoreProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
-{
-  nsIDOMToolkitCore *a = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == a) {
-    return JS_TRUE;
-  }
-
-  if (JSVAL_IS_INT(id)) {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
-    }
-    switch(JSVAL_TO_INT(id)) {
-      case 0:
-      default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-    }
-  }
-  else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
-  }
-
-  return PR_TRUE;
-}
-
-
-//
-// ToolkitCore finalizer
-//
-PR_STATIC_CALLBACK(void)
-FinalizeToolkitCore(JSContext *cx, JSObject *obj)
-{
-  nsJSUtils::nsGenericFinalize(cx, obj);
-}
-
-
-//
-// ToolkitCore enumerate
-//
-PR_STATIC_CALLBACK(JSBool)
-EnumerateToolkitCore(JSContext *cx, JSObject *obj)
-{
-  return nsJSUtils::nsGenericEnumerate(cx, obj);
-}
-
-
-//
-// ToolkitCore resolve
-//
-PR_STATIC_CALLBACK(JSBool)
-ResolveToolkitCore(JSContext *cx, JSObject *obj, jsval id)
-{
-  return nsJSUtils::nsGenericResolve(cx, obj, id);
-}
-
-
-//
-// Native method ShowDialog
-//
-PR_STATIC_CALLBACK(JSBool)
-ToolkitCoreShowDialog(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMToolkitCore *nativeThis = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsAutoString b0;
-  nsCOMPtr<nsIDOMWindow> b1;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWDIALOG, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 2) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b1),
-                                           kIWindowIID,
-                                           "Window",
-                                           cx,
-                                           argv[1])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-
-    result = nativeThis->ShowDialog(b0, b1);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method ShowWindow
-//
-PR_STATIC_CALLBACK(JSBool)
-ToolkitCoreShowWindow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMToolkitCore *nativeThis = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsAutoString b0;
-  nsCOMPtr<nsIDOMWindow> b1;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWWINDOW, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 2) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b1),
-                                           kIWindowIID,
-                                           "Window",
-                                           cx,
-                                           argv[1])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-
-    result = nativeThis->ShowWindow(b0, b1);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method ShowWindowWithArgs
-//
-PR_STATIC_CALLBACK(JSBool)
-ToolkitCoreShowWindowWithArgs(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMToolkitCore *nativeThis = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsAutoString b0;
-  nsCOMPtr<nsIDOMWindow> b1;
-  nsAutoString b2;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWWINDOWWITHARGS, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 3) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b1),
-                                           kIWindowIID,
-                                           "Window",
-                                           cx,
-                                           argv[1])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-    nsJSUtils::nsConvertJSValToString(b2, cx, argv[2]);
-
-    result = nativeThis->ShowWindowWithArgs(b0, b1, b2);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method ShowModalDialog
-//
-PR_STATIC_CALLBACK(JSBool)
-ToolkitCoreShowModalDialog(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMToolkitCore *nativeThis = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsAutoString b0;
-  nsCOMPtr<nsIDOMWindow> b1;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWMODALDIALOG, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 2) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b1),
-                                           kIWindowIID,
-                                           "Window",
-                                           cx,
-                                           argv[1])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-
-    result = nativeThis->ShowModalDialog(b0, b1);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method CloseWindow
-//
-PR_STATIC_CALLBACK(JSBool)
-ToolkitCoreCloseWindow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMToolkitCore *nativeThis = (nsIDOMToolkitCore*)nsJSUtils::nsGetNativeThis(cx, obj);
-  nsresult result = NS_OK;
-  nsCOMPtr<nsIDOMWindow> b0;
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  {
-
-  *rval = JSVAL_NULL;
-
-  {
-    nsresult rv;
-    NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_CLOSEWINDOW, PR_FALSE);
-    }
-    if (NS_FAILED(rv)) {
-      return nsJSUtils::nsReportError(cx, obj, rv);
-    }
-  }
-
-    if (argc < 1) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR);
-    }
-
-    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)(void**)getter_AddRefs(b0),
-                                           kIWindowIID,
-                                           "Window",
-                                           cx,
-                                           argv[0])) {
-      return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_NOT_OBJECT_ERR);
-    }
-
-    result = nativeThis->CloseWindow(b0);
-    if (NS_FAILED(result)) {
-      return nsJSUtils::nsReportError(cx, obj, result);
-    }
-
-    *rval = JSVAL_VOID;
-  }
-
-  return JS_TRUE;
-}
-
-
-/***********************************************************************/
-//
-// class for ToolkitCore
-//
-JSClass ToolkitCoreClass = {
-  "ToolkitCore", 
-  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  GetToolkitCoreProperty,
-  SetToolkitCoreProperty,
-  EnumerateToolkitCore,
-  ResolveToolkitCore,
-  JS_ConvertStub,
-  FinalizeToolkitCore,
-  nsnull,
-  nsJSUtils::nsCheckAccess
-};
-
-
-//
-// ToolkitCore class properties
-//
-static JSPropertySpec ToolkitCoreProperties[] =
-{
-  {0}
-};
-
-
-//
-// ToolkitCore class methods
-//
-static JSFunctionSpec ToolkitCoreMethods[] = 
-{
-  {"ShowDialog",          ToolkitCoreShowDialog,     2},
-  {"ShowWindow",          ToolkitCoreShowWindow,     2},
-  {"ShowWindowWithArgs",          ToolkitCoreShowWindowWithArgs,     3},
-  {"ShowModalDialog",          ToolkitCoreShowModalDialog,     2},
-  {"CloseWindow",          ToolkitCoreCloseWindow,     1},
-  {0}
-};
-
-
-//
-// ToolkitCore constructor
-//
-PR_STATIC_CALLBACK(JSBool)
-ToolkitCore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsresult result;
-  nsIID classID;
-  nsIDOMToolkitCore *nativeThis;
-  nsIScriptObjectOwner *owner = nsnull;
-  nsIJSNativeInitializer* initializer = nsnull;
-
-  static NS_DEFINE_IID(kIDOMToolkitCoreIID, NS_IDOMTOOLKITCORE_IID);
-  static NS_DEFINE_IID(kIJSNativeInitializerIID, NS_IJSNATIVEINITIALIZER_IID);
-
-  nsCOMPtr<nsIScriptContext> scriptCX;
-  nsJSUtils::nsGetStaticScriptContext(cx, obj, getter_AddRefs(scriptCX));
-  if (!scriptCX) {
-    return JS_FALSE;
-  }
-
-  nsCOMPtr<nsIScriptNameSpaceManager> manager;
-  scriptCX->GetNameSpaceManager(getter_AddRefs(manager));
-  if (!manager) {
-    return JS_FALSE;
-  }
-
-  result = manager->LookupName("ToolkitCore", PR_TRUE, classID);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  result = nsComponentManager::CreateInstance(classID,
-                                        nsnull,
-                                        kIDOMToolkitCoreIID,
-                                        (void **)&nativeThis);
-  if (NS_OK != result) {
-    return JS_FALSE;
-  }
-
-  result = nativeThis->QueryInterface(kIJSNativeInitializerIID, (void **)&initializer);
-  if (NS_OK == result) {
-    result = initializer->Initialize(cx, obj, argc, argv);
-    NS_RELEASE(initializer);
-
-    if (NS_OK != result) {
-      NS_RELEASE(nativeThis);
-      return JS_FALSE;
-    }
-  }
-
-  result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-  if (NS_OK != result) {
-    NS_RELEASE(nativeThis);
-    return JS_FALSE;
-  }
-
-  owner->SetScriptObject((void *)obj);
-  JS_SetPrivate(cx, obj, nativeThis);
-
-  NS_RELEASE(owner);
-  return JS_TRUE;
-}
-
-//
-// ToolkitCore class initialization
-//
-extern "C" NS_DOM nsresult NS_InitToolkitCoreClass(nsIScriptContext *aContext, void **aPrototype)
-{
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  JSObject *proto = nsnull;
-  JSObject *constructor = nsnull;
-  JSObject *parent_proto = nsnull;
-  JSObject *global = JS_GetGlobalObject(jscontext);
-  jsval vp;
-
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "ToolkitCore", &vp)) ||
-      !JSVAL_IS_OBJECT(vp) ||
-      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
-      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) {
-
-    if (NS_OK != NS_InitBaseAppCoreClass(aContext, (void **)&parent_proto)) {
-      return NS_ERROR_FAILURE;
-    }
-    proto = JS_InitClass(jscontext,     // context
-                         global,        // global object
-                         parent_proto,  // parent proto 
-                         &ToolkitCoreClass,      // JSClass
-                         ToolkitCore,            // JSNative ctor
-                         0,             // ctor args
-                         ToolkitCoreProperties,  // proto props
-                         ToolkitCoreMethods,     // proto funcs
-                         nsnull,        // ctor props (static)
-                         nsnull);       // ctor funcs (static)
-    if (nsnull == proto) {
-      return NS_ERROR_FAILURE;
-    }
-
-  }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
-    proto = JSVAL_TO_OBJECT(vp);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aPrototype) {
-    *aPrototype = proto;
-  }
-  return NS_OK;
-}
-
-
-//
-// Method for creating a new ToolkitCore JavaScript object
-//
-extern "C" NS_DOM nsresult NS_NewScriptToolkitCore(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
-{
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptToolkitCore");
-  JSObject *proto;
-  JSObject *parent;
-  nsIScriptObjectOwner *owner;
-  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
-  nsresult result = NS_OK;
-  nsIDOMToolkitCore *aToolkitCore;
-
-  if (nsnull == aParent) {
-    parent = nsnull;
-  }
-  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
-    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
-      NS_RELEASE(owner);
-      return NS_ERROR_FAILURE;
-    }
-    NS_RELEASE(owner);
-  }
-  else {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (NS_OK != NS_InitToolkitCoreClass(aContext, (void **)&proto)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  result = aSupports->QueryInterface(kIToolkitCoreIID, (void **)&aToolkitCore);
-  if (NS_OK != result) {
-    return result;
-  }
-
-  // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &ToolkitCoreClass, proto, parent);
-  if (nsnull != *aReturn) {
-    // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aToolkitCore);
-  }
-  else {
-    NS_RELEASE(aToolkitCore);
-    return NS_ERROR_FAILURE; 
-  }
-
-  return NS_OK;
-}
--- a/xpfe/AppCores/src/nsSignonCoreFactory.cpp
+++ b/xpfe/AppCores/src/nsSignonCoreFactory.cpp
@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsSignonCoreFactory.h"
-
-#include "nsAppCores.h"
-#include "nsSignonCore.h"
-#include "pratom.h"
-#include "nsISupportsUtils.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-//----------------------------------------------------------------------------------------
-nsSignonCoreFactory::nsSignonCoreFactory()
-//----------------------------------------------------------------------------------------
-{
-    NS_INIT_REFCNT();
-    IncInstanceCount();
-}
-
-//----------------------------------------------------------------------------------------
-nsSignonCoreFactory::~nsSignonCoreFactory()
-//----------------------------------------------------------------------------------------
-{
-    DecInstanceCount();
-}
-
-NS_IMPL_ADDREF(nsSignonCoreFactory)
-NS_IMPL_RELEASE(nsSignonCoreFactory)
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsSignonCoreFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-//----------------------------------------------------------------------------------------
-{
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
-
-    if ( aIID.Equals(kISupportsIID) )
-        *aInstancePtr = (void*) this;
-    else if ( aIID.Equals(kIFactoryIID) )
-        *aInstancePtr = (void*) this;
-
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NO_INTERFACE;
-
-    AddRef();
-    return NS_OK;
-} // nsSignonCoreFactory::QueryInterface
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsSignonCoreFactory::CreateInstance(
-    nsISupports* aOuter,
-    REFNSIID aIID,
-    void **aResult)
-//----------------------------------------------------------------------------------------
-{
-    if (aResult == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    *aResult = NULL;
-
-#if 0
-    // There is a stupid bug that I don't feel competent to fix. Basically, the
-    // AppCore Manager is a waste of time (the manager gets created, an app core is
-    // added to the list, and then the app core manager is deleted, along with its list).
-    // I want to insist that
-    // there is always one instance of the Signon app core. Hence this HACK.
-    static nsSignonCore* inst = nsnull;
-    PRBool firstTime = (inst == nsnull);
-    if (firstTime)
-    {
-        inst = new nsSignonCore();
-        if (!inst)
-            return NS_ERROR_OUT_OF_MEMORY;
-        NS_ADDREF(inst);
-    }
-	nsresult result =  inst->QueryInterface(aIID, aResult);
-	if (result != NS_OK && firstTime)
-	    NS_RELEASE(inst);
-#else
-    static nsSignonCore* inst = new nsSignonCore();
-    if (!inst)
-        return NS_ERROR_OUT_OF_MEMORY;
-	nsresult result =  inst->QueryInterface(aIID, aResult);
-#endif
-    return result;
-} // nsSignonCoreFactory::CreateInstance
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsSignonCoreFactory::LockFactory(PRBool aLock)
-//----------------------------------------------------------------------------------------
-{
-    if (aLock)
-        IncLockCount();
-    else
-        DecLockCount();
-    return NS_OK;
-} // nsSignonCoreFactory::LockFactory
--- a/xpfe/AppCores/src/nsSignonCoreFactory.h
+++ b/xpfe/AppCores/src/nsSignonCoreFactory.h
@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsSignonCoreFactory_h___
-#define nsSignonCoreFactory_h___
-
-//#include "nscore.h"
-//#include "nsString.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-
-//========================================================================================
-class nsSignonCoreFactory : public nsIFactory 
-//========================================================================================
-{
-    public:
-        
-        nsSignonCoreFactory();
-        virtual ~nsSignonCoreFactory();
-        
-        PRBool CanUnload(void);
-
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                      REFNSIID aIID,
-                                      void **aResult);
-
-        NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-#endif // nsSignonCoreFactory_h___
--- a/xpfe/AppCores/src/nsToolkitCore.cpp
+++ b/xpfe/AppCores/src/nsToolkitCore.cpp
@ -1,371 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsAppCoresManager.h"
-#include "nsAppShellCIDs.h"
-#include "nsIAppShellService.h"
-#include "nsIEventQueueService.h"
-#include "nsIDOMBaseAppCore.h"
-#include "nsIDOMWindow.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIServiceManager.h"
-#include "nsISupports.h"
-#include "nsIURL.h"
-#include "nsIIOService.h"
-#include "nsIURL.h"
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-#include "nsIBrowserWindow.h"
-#include "nsIWebShell.h"
-#include "nsIWebShellWindow.h"
-#include "nsIWidget.h"
-#include "nsToolkitCore.h"
-
-#include "nsIXULWindowCallbacks.h"
-#include "nsIDocumentViewer.h"
-#include "nsIDOMXULDocument.h"
-#include "nsIDocument.h"
-#include "nsIDOMElement.h"
-
-class nsIScriptContext;
-
-static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
-
-static NS_DEFINE_IID(kIDOMBaseAppCoreIID, NS_IDOMBASEAPPCORE_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIToolkitCoreIID, NS_IDOMTOOLKITCORE_IID);
-
-
-/////////////////////////////////////////////////////////////////////////
-// nsToolkitCore
-/////////////////////////////////////////////////////////////////////////
-
-nsToolkitCore::nsToolkitCore() {
-
-  printf("Created nsToolkitCore\n");
-
-  IncInstanceCount();
-  NS_INIT_REFCNT();
-}
-
-nsToolkitCore::~nsToolkitCore() {
-
-  DecInstanceCount();  
-}
-
-
-NS_IMPL_ADDREF(nsToolkitCore)
-NS_IMPL_RELEASE(nsToolkitCore)
-
-
-NS_IMETHODIMP 
-nsToolkitCore::QueryInterface(REFNSIID aIID, void** aInstancePtr) {
-
-  if (aInstancePtr == NULL)
-    return NS_ERROR_NULL_POINTER;
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(kIToolkitCoreIID)) {
-    *aInstancePtr = (void*) ((nsIDOMToolkitCore*) this);
-    AddRef();
-    return NS_OK;
-  }
- 
-  return nsBaseAppCore::QueryInterface(aIID, aInstancePtr);
-}
-
-
-NS_IMETHODIMP 
-nsToolkitCore::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject) {
-  nsresult rv = NS_OK;
-
-  NS_PRECONDITION(aScriptObject != nsnull, "null arg");
-  if (mScriptObject == nsnull) {
-      nsISupports *core;
-      rv = QueryInterface(kISupportsIID, (void **)&core);
-      if (NS_SUCCEEDED(rv)) {
-        rv = NS_NewScriptToolkitCore(aContext, 
-                                     (nsISupports *) core,
-                                     nsnull, 
-                                     &mScriptObject);
-        NS_RELEASE(core);
-      }
-  }
-
-  *aScriptObject = mScriptObject;
-  return rv;
-}
-
-
-NS_IMETHODIMP    
-nsToolkitCore::Init(const nsString& aId) {
-
-  nsresult rv;
-
-  nsBaseAppCore::Init(aId);
-
-  nsIDOMBaseAppCore *core;
-  rv = QueryInterface(kIDOMBaseAppCoreIID, (void **)&core);
-  if (NS_SUCCEEDED(rv)) {
-    nsAppCoresManager* sdm = new nsAppCoresManager();
-    if (sdm) {
-      sdm->Add(core);
-      delete sdm;
-      return NS_OK;
-    } else
-      rv = NS_ERROR_OUT_OF_MEMORY;
-    NS_RELEASE(core);
-  }
-  return rv;
-}
-
-
-NS_IMETHODIMP
-nsToolkitCore::ShowDialog(const nsString& aUrl, nsIDOMWindow* aParent) {
-
-  nsresult           rv;
-  nsIWebShellWindow  *window;
-
-  window = nsnull;
-
-  nsCOMPtr<nsIURI> urlObj;
-  NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  rv = service->NewURI(nsCAutoString(aUrl), nsnull, getter_AddRefs(urlObj));
-  if (NS_FAILED(rv)) return rv;
-  if (NS_FAILED(rv))
-    return rv;
-
-  NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIWebShellWindow> parent;
-  DOMWindowToWebShellWindow(aParent, &parent);
-  window = nsnull;
-  appShell->CreateTopLevelWindow(parent, urlObj, PR_TRUE, PR_TRUE,
-                               NS_CHROME_ALL_CHROME | NS_CHROME_OPEN_AS_DIALOG,
-                               nsnull, 615, 480, &window);
-
-  if (window != nsnull)
-    window->Show(PR_TRUE);
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsToolkitCore::ShowWindow(const nsString& aUrl, nsIDOMWindow* aParent) {
-
-  nsresult           rv;
-
-  nsCOMPtr<nsIURI> urlObj;
-
-  NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  rv = service->NewURI(nsCAutoString(aUrl), nsnull, getter_AddRefs(urlObj));
-  if (NS_FAILED(rv)) return rv;
-
-  NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIWebShellWindow> parent;
-  DOMWindowToWebShellWindow(aParent, &parent);
-  nsCOMPtr<nsIWebShellWindow> window;
-  appShell->CreateTopLevelWindow(parent, urlObj, PR_TRUE, PR_TRUE,
-                               NS_CHROME_ALL_CHROME, nsnull,
-                               NS_SIZETOCONTENT, NS_SIZETOCONTENT,
-                               getter_AddRefs(window));
-
-  return rv;
-}
-
-struct nsArgCallbacks : public nsIXULWindowCallbacks {
-    // Declare implementation of ISupports stuff.
-    NS_DECL_ISUPPORTS
-
-    // Declare implementations of nsIXULWindowCallbacks interface functions.
-    NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
-    NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
-
-    // Specifics...
-    nsArgCallbacks( const nsString& aArgs ) : mArgs( aArgs ) { NS_INIT_REFCNT(); }
-    nsArgCallbacks() { NS_INIT_REFCNT(); }
-    virtual ~nsArgCallbacks() {}
-private:
-    nsString mArgs;
-}; // nsArgCallbacks
-
-// Implement ISupports stuff.
-NS_IMPL_ISUPPORTS( nsArgCallbacks, NS_GET_IID(nsIXULWindowCallbacks) );
-
-static const int APP_DEBUG = 0;
-static nsresult setAttribute( nsIWebShell *shell,
-                              const char *id,
-                              const char *name,
-                              const nsString &value ) {
-    nsresult rv = NS_OK;
-
-    nsCOMPtr<nsIContentViewer> cv;
-    rv = shell ? shell->GetContentViewer(getter_AddRefs(cv))
-               : NS_ERROR_NULL_POINTER;
-    if ( cv ) {
-        // Up-cast.
-        nsCOMPtr<nsIDocumentViewer> docv(do_QueryInterface(cv));
-        if ( docv ) {
-            // Get the document from the doc viewer.
-            nsCOMPtr<nsIDocument> doc;
-            rv = docv->GetDocument(*getter_AddRefs(doc));
-            if ( doc ) {
-                // Up-cast.
-                nsCOMPtr<nsIDOMXULDocument> xulDoc( do_QueryInterface(doc) );
-                if ( xulDoc ) {
-                    // Find specified element.
-                    nsCOMPtr<nsIDOMElement> elem;
-                    rv = xulDoc->GetElementById( id, getter_AddRefs(elem) );
-                    if ( elem ) {
-                        // Set the text attribute.
-                        rv = elem->SetAttribute( name, value );
-                        if ( APP_DEBUG ) {
-                            char *p = value.ToNewCString();
-                            delete [] p;
-                        }
-                        if ( rv != NS_OK ) {
-                             if (APP_DEBUG) printf("SetAttribute failed, rv=0x%X\n",(int)rv);
-                        }
-                    } else {
-                        if (APP_DEBUG) printf("GetElementByID failed, rv=0x%X\n",(int)rv);
-                    }
-                } else {
-                  if (APP_DEBUG)   printf("Upcast to nsIDOMXULDocument failed\n");
-                }
-            } else {
-                if (APP_DEBUG) printf("GetDocument failed, rv=0x%X\n",(int)rv);
-            }
-        } else {
-             if (APP_DEBUG) printf("Upcast to nsIDocumentViewer failed\n");
-        }
-    } else {
-        if (APP_DEBUG) printf("GetContentViewer failed, rv=0x%X\n",(int)rv);
-    }
-    return rv;
-}
-
-// Stick the arg in the document.
-NS_IMETHODIMP
-nsArgCallbacks::ConstructBeforeJavaScript( nsIWebShell *aWebShell ) {
-    nsresult rv = NS_OK;
-    setAttribute( aWebShell, "args", "value", mArgs );
-    // Trigger dialog arg handling.
-    setAttribute( aWebShell, "dialog.start", "ready", "true" );
-    return rv;
-}
-
-NS_IMETHODIMP
-nsToolkitCore::ShowWindowWithArgs(const nsString& aUrl,
-                                  nsIDOMWindow* aParent,
-                                  const nsString& aArgs) {
-
-  nsresult           rv;
-
-  nsCOMPtr<nsIURI> urlObj;
-  NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  rv = service->NewURI(nsCAutoString(aUrl), nsnull, getter_AddRefs(urlObj));
-  if (NS_FAILED(rv)) return rv;
-
-  NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIWebShellWindow> parent;
-  DOMWindowToWebShellWindow(aParent, &parent);
-  nsCOMPtr<nsArgCallbacks> cb;
-  cb = dont_QueryInterface( new nsArgCallbacks( aArgs ) );
-
-  nsCOMPtr<nsIWebShellWindow>  window;
-  appShell->CreateTopLevelWindow(parent, urlObj, PR_TRUE, PR_TRUE,
-                               NS_CHROME_ALL_CHROME, cb,
-                               NS_SIZETOCONTENT, NS_SIZETOCONTENT,
-                               getter_AddRefs(window));
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsToolkitCore::ShowModalDialog(const nsString& aUrl, nsIDOMWindow* aParent) {
-
-  nsresult           rv;
-
-  nsCOMPtr<nsIURI> urlObj;
-  NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  rv = service->NewURI(nsCAutoString(aUrl), nsnull, getter_AddRefs(urlObj));
-  if (NS_FAILED(rv)) return rv;
-
-  NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIWebShellWindow> parent;
-  DOMWindowToWebShellWindow(aParent, &parent);
-  rv = appShell->RunModalDialog(nsnull, parent, urlObj,
-                                NS_CHROME_ALL_CHROME | NS_CHROME_OPEN_AS_DIALOG,
-                                nsnull, 615, 480);
-  return rv;
-}
-
-NS_IMETHODIMP
-nsToolkitCore::CloseWindow(nsIDOMWindow* aWindow) {
-
-  nsCOMPtr<nsIWebShellWindow> window;
-  DOMWindowToWebShellWindow(aWindow, &window);
-  if (window)
-    window->Close();
-
-  return NS_OK;
-}
-
-// horribly complicated routine to simply convert from one to the other
-void nsToolkitCore::DOMWindowToWebShellWindow(
-                      nsIDOMWindow *DOMWindow,
-                      nsCOMPtr<nsIWebShellWindow> *webWindow) const {
-
-  *webWindow = 0;
-  if (!DOMWindow)
-    return;
-
-  nsCOMPtr<nsIScriptGlobalObject> globalScript(do_QueryInterface(DOMWindow));
-  nsCOMPtr<nsIWebShell> webshell, rootWebshell;
-  if (globalScript)
-    globalScript->GetWebShell(getter_AddRefs(webshell));
-  if(!webshell)
-   return;
-  nsCOMPtr<nsIWebShellContainer> topLevelWindow;
-  webshell->GetTopLevelWindow(getter_AddRefs(topLevelWindow));
-  *webWindow = do_QueryInterface(topLevelWindow);
-}
-
--- a/xpfe/AppCores/src/nsToolkitCore.h
+++ b/xpfe/AppCores/src/nsToolkitCore.h
@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsToolkitCorePrivate_h___
-#define nsToolkitCorePrivate_h___
-
-//#include "nsAppCores.h"
-
-#include "nsCOMPtr.h"
-#include "nscore.h"
-#include "nsString.h"
-#include "nsISupports.h"
-
-#include "nsIDOMToolkitCore.h"
-#include "nsBaseAppCore.h"
-
-
-class nsIDOMWindow;
-class nsIScriptContext;
-
-// Cannot forward declare a class used with an nsCOMPtr.
-// see: http://www.mozilla.org/projects/xpcom/nsCOMPtr.html
-//class nsIWebShellWindow;
-
-#include "nsIWebShellWindow.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// nsToolbarCore:
-////////////////////////////////////////////////////////////////////////////////
-
-class nsToolkitCore : public nsBaseAppCore, 
-                      public nsIDOMToolkitCore {
-
-  public:
-  
-    nsToolkitCore();
-    virtual ~nsToolkitCore();
-                 
-
-    NS_DECL_ISUPPORTS
-    NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-    NS_IMETHOD    Init(const nsString& aId);
-    NS_IMETHOD    GetId(nsString& aId) { return nsBaseAppCore::GetId(aId); } 
-    NS_IMETHOD    SetDocumentCharset(const nsString& aCharset)  { return nsBaseAppCore::SetDocumentCharset(aCharset); } 
-
-    NS_DECL_IDOMTOOLKITCORE
-
-  private:
-
-    void          DOMWindowToWebShellWindow(nsIDOMWindow *DOMWindow,
-                    nsCOMPtr<nsIWebShellWindow> *webWindow) const;
-};
-
-#endif // nsToolkitCorePrivate_h___
--- a/xpfe/AppCores/src/nsToolkitCoreFactory.cpp
+++ b/xpfe/AppCores/src/nsToolkitCoreFactory.cpp
@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsToolkitCore.h"
-#include "nsToolkitCoreFactory.h"
-//#include "pratom.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-/////////////////////////////////////////////////////////////////////////
-// nsToolkitCoreFactory
-/////////////////////////////////////////////////////////////////////////
-
-nsToolkitCoreFactory::nsToolkitCoreFactory(void) {
-
-    mRefCnt = 0;
-    IncInstanceCount();
-}
-
-nsToolkitCoreFactory::~nsToolkitCoreFactory(void) {
-
-    DecInstanceCount();
-}
-
-
-
-NS_IMETHODIMP 
-nsToolkitCoreFactory::QueryInterface(REFNSIID aIID, void** aInstancePtr) {
-
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    *aInstancePtr = NULL;
-
-    if (aIID.Equals(kISupportsIID))
-        *aInstancePtr = (void*) this;
-    else if (aIID.Equals(kIFactoryIID))
-        *aInstancePtr = (void*) this;
-
-    if (*aInstancePtr == NULL)
-        return NS_ERROR_NO_INTERFACE;
-
-    AddRef();
-    return NS_OK;
-}
-
-
-
-NS_IMPL_ADDREF(nsToolkitCoreFactory)
-NS_IMPL_RELEASE(nsToolkitCoreFactory)
-
-NS_IMETHODIMP
-nsToolkitCoreFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult) {
-
-    if (aResult == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    *aResult = NULL;
-
-    nsToolkitCore *inst = new nsToolkitCore();
-
-    if (inst == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult result = inst->QueryInterface(aIID, aResult);
-
-    if (result != NS_OK)
-        delete inst;
-
-    return result;
-}
-
-NS_IMETHODIMP
-nsToolkitCoreFactory::LockFactory(PRBool aLock) {
-
-    if (aLock)
-        IncLockCount();
-    else
-        DecLockCount();
-
-    return NS_OK;
-}
--- a/xpfe/AppCores/src/nsToolkitCoreFactory.h
+++ b/xpfe/AppCores/src/nsToolkitCoreFactory.h
@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsToolkitCoreFactory_h___
-#define nsToolkitCoreFactory_h___
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// nsToolkitCoreFactory:
-////////////////////////////////////////////////////////////////////////////////
-
-class nsToolkitCoreFactory : public nsIFactory  {
-
-    public:
-        
-        nsToolkitCoreFactory();
-        virtual ~nsToolkitCoreFactory();
-        
-//        PRBool CanUnload(void);
-
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                  REFNSIID aIID,
-                                  void **aResult);
-
-        NS_IMETHOD LockFactory(PRBool aLock);
-};
-
-#endif // nsToolkitCoreFactory_h___
--- a/xpfe/AppCores/src/nsWalletCoreFactory.cpp
+++ b/xpfe/AppCores/src/nsWalletCoreFactory.cpp
@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWalletCoreFactory.h"
-
-#include "nsAppCores.h"
-#include "nsWalletCore.h"
-#include "pratom.h"
-#include "nsISupportsUtils.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-
-//----------------------------------------------------------------------------------------
-nsWalletCoreFactory::nsWalletCoreFactory()
-//----------------------------------------------------------------------------------------
-{
-    NS_INIT_REFCNT();
-    IncInstanceCount();
-}
-
-//----------------------------------------------------------------------------------------
-nsWalletCoreFactory::~nsWalletCoreFactory()
-//----------------------------------------------------------------------------------------
-{
-    DecInstanceCount();
-}
-
-NS_IMPL_ADDREF(nsWalletCoreFactory)
-NS_IMPL_RELEASE(nsWalletCoreFactory)
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsWalletCoreFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
-//----------------------------------------------------------------------------------------
-{
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
-
-    if ( aIID.Equals(kISupportsIID) )
-        *aInstancePtr = (void*) this;
-    else if ( aIID.Equals(kIFactoryIID) )
-        *aInstancePtr = (void*) this;
-
-    if (aInstancePtr == NULL)
-        return NS_ERROR_NO_INTERFACE;
-
-    AddRef();
-    return NS_OK;
-} // nsWalletCoreFactory::QueryInterface
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsWalletCoreFactory::CreateInstance(
-    nsISupports* aOuter,
-    REFNSIID aIID,
-    void **aResult)
-//----------------------------------------------------------------------------------------
-{
-    if (aResult == NULL)
-        return NS_ERROR_NULL_POINTER;
-
-    *aResult = NULL;
-
-#if 0
-    // There is a stupid bug that I don't feel competent to fix. Basically, the
-    // AppCore Manager is a waste of time (the manager gets created, an app core is
-    // added to the list, and then the app core manager is deleted, along with its list).
-    // I want to insist that
-    // there is always one instance of the Wallet app core. Hence this HACK.
-    static nsWalletCore* inst = nsnull;
-    PRBool firstTime = (inst == nsnull);
-    if (firstTime)
-    {
-        inst = new nsWalletCore();
-        if (!inst)
-            return NS_ERROR_OUT_OF_MEMORY;
-        NS_ADDREF(inst);
-    }
-	nsresult result =  inst->QueryInterface(aIID, aResult);
-	if (result != NS_OK && firstTime)
-	    NS_RELEASE(inst);
-#else
-    static nsWalletCore* inst = new nsWalletCore();
-    if (!inst)
-        return NS_ERROR_OUT_OF_MEMORY;
-	nsresult result =  inst->QueryInterface(aIID, aResult);
-#endif
-    return result;
-} // nsWalletCoreFactory::CreateInstance
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsWalletCoreFactory::LockFactory(PRBool aLock)
-//----------------------------------------------------------------------------------------
-{
-    if (aLock)
-        IncLockCount();
-    else
-        DecLockCount();
-    return NS_OK;
-} // nsWalletCoreFactory::LockFactory
--- a/xpfe/AppCores/src/nsWalletCoreFactory.h
+++ b/xpfe/AppCores/src/nsWalletCoreFactory.h
@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsWalletCoreFactory_h___
-#define nsWalletCoreFactory_h___
-
-//#include "nscore.h"
-//#include "nsString.h"
-#include "nsIFactory.h"
-#include "nsISupports.h"
-
-//========================================================================================
-class nsWalletCoreFactory : public nsIFactory 
-//========================================================================================
-{
-    public:
-        
-        nsWalletCoreFactory();
-        virtual ~nsWalletCoreFactory();
-        
-        PRBool CanUnload(void);
-
-        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD CreateInstance(nsISupports *aOuter,
-                                      REFNSIID aIID,
-                                      void **aResult);
-
-        NS_IMETHOD LockFactory(PRBool aLock);
-
-};
-
-#endif // nsWalletCoreFactory_h___
--- a/xpfe/AppCores/xul/.cvsignore
+++ b/xpfe/AppCores/xul/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/xpfe/AppCores/xul/Makefile.in
+++ b/xpfe/AppCores/xul/Makefile.in
@ -1,110 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXPORT_RESOURCE_TOOLBAR = \
-		$(srcdir)/resources/Mail_Forward.gif \
-		$(srcdir)/resources/Mail_GetMsg.gif \
-		$(srcdir)/resources/Mail_NewMsg.gif \
-		$(srcdir)/resources/Mail_Reply.gif \
-		$(srcdir)/resources/Mail_SendMsg.gif \
-		$(srcdir)/resources/DialogAddrIcon.gif \
-		$(srcdir)/resources/DialogAddrIcon_mo.gif \
-		$(srcdir)/resources/DialogCompIcon.gif \
-		$(srcdir)/resources/DialogCompIcon_mo.gif \
-		$(srcdir)/resources/DialogMailIcon.gif \
-		$(srcdir)/resources/DialogMailIcon_mo.gif \
-		$(srcdir)/resources/DialogNavIcon.gif \
-		$(srcdir)/resources/DialogNavIcon_mo.gif \
-		$(srcdir)/resources/TB_Back.gif \
-		$(srcdir)/resources/TB_Back_dis.gif \
-		$(srcdir)/resources/TB_Back_mo.gif \
-		$(srcdir)/resources/TB_Bookmarks.gif \
-		$(srcdir)/resources/TB_Bookmarks_mo.gif \
-		$(srcdir)/resources/TB_Edit.gif \
-		$(srcdir)/resources/TB_Forward.gif \
-		$(srcdir)/resources/TB_Forward_dis.gif \
-		$(srcdir)/resources/TB_Forward_mo.gif \
-		$(srcdir)/resources/TB_Home.gif \
-		$(srcdir)/resources/TB_Home_mo.gif \
-		$(srcdir)/resources/TB_HTab.gif \
-		$(srcdir)/resources/TB_HTab_mo.gif \
-		$(srcdir)/resources/TB_LoadImages.gif \
-		$(srcdir)/resources/TB_Location.gif \
-		$(srcdir)/resources/TB_Location_mo.gif \
-		$(srcdir)/resources/TB_MiniAddr.gif \
-		$(srcdir)/resources/TB_MiniComp.gif \
-		$(srcdir)/resources/TB_MiniMail.gif \
-		$(srcdir)/resources/TB_MiniNav.gif \
-		$(srcdir)/resources/TB_MiniTab.gif \
-		$(srcdir)/resources/TB_MixSecurity.gif \
-		$(srcdir)/resources/TB_Netscape.gif \
-		$(srcdir)/resources/TB_Netscape_mo.gif \
-		$(srcdir)/resources/TB_PersonalIcon.gif \
-		$(srcdir)/resources/TB_Places.gif \
-		$(srcdir)/resources/TB_Places_mo.gif \
-		$(srcdir)/resources/TB_popup.gif \
-		$(srcdir)/resources/TB_Print.gif \
-		$(srcdir)/resources/TB_Print_mo.gif \
-		$(srcdir)/resources/TB_Reload.gif \
-		$(srcdir)/resources/TB_Reload_mo.gif \
-		$(srcdir)/resources/TB_Search.gif \
-		$(srcdir)/resources/TB_Search_mo.gif \
-		$(srcdir)/resources/TB_Secure.gif \
-		$(srcdir)/resources/TB_Secure_mo.gif \
-		$(srcdir)/resources/TB_Stop.gif \
-		$(srcdir)/resources/TB_Stop_dis.gif \
-		$(srcdir)/resources/TB_Stop_mo.gif \
-		$(srcdir)/resources/TB_Tab.gif \
-		$(srcdir)/resources/TB_TabSmall.gif \
-		$(srcdir)/resources/TB_TabSmall_mo.gif \
-		$(srcdir)/resources/TB_Tab_mo.gif \
-		$(srcdir)/resources/TB_Unsecure.gif \
-		$(srcdir)/resources/TB_WhatsRelated.gif \
-		$(srcdir)/resources/TB_WhatsRelated_mo.gif \
-		$(srcdir)/resources/StatusBar-insecure.gif \
-		$(srcdir)/resources/StatusBar-secure.gif \
-		$(srcdir)/resources/TB_NewBack.gif \
-		$(srcdir)/resources/TB_NewForward.gif \
-		$(srcdir)/resources/TB_NewReload.gif \
-		$(srcdir)/resources/TB_NewStop.gif \
-		$(srcdir)/resources/TB_NewHome.gif \
-		$(srcdir)/resources/TB_NewPrint.gif \
-		$(srcdir)/resources/grippy-horizontal-before.gif \
-		$(srcdir)/resources/grippy-horizontal-after.gif \
-		$(srcdir)/resources/grippy-vertical-before.gif \
-		$(srcdir)/resources/grippy-vertical-after.gif \
-		$(NULL)
-
-EXPORT_RESOURCE_THROBBER = $(srcdir)/resources/throbbingN.gif
-
-include $(topsrcdir)/config/rules.mk
-
-install:: 
-	$(INSTALL) $(EXPORT_RESOURCE_TOOLBAR) $(DIST)/bin/res/toolbar
-	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
-
--- a/xpfe/AppCores/xul/Password.html
+++ b/xpfe/AppCores/xul/Password.html
@ -1,70 +0,0 @@
-<html>
-<head>
-
-
-
-<style type="text/css">
-/* This style sheet should be in a seperate file */
-
-FIELDSET {
-    background-color: rgb(192, 192, 192);
-    border: 2px groove rgb(192, 192, 192);
-    display: inline; 
-    margin-left: 10px; 
-    padding: 2px;
-  }
- 
-LEGEND {
-    background-color:rgb(192, 192, 192);  
-    border: none ; 
-    padding: 2px;
-  }
-
-
-BODY,TD {
-    font-family: Sans-Serif;
-    background-color: #C0C0C0;
-  }
-
-LABEL {
-    background-color: #C0C0C0;
-    margin: 0px 0px 0px 0px;
-	  padding-left: 0px;
-	  padding-right: 0px;
-  }
-
-BODY,TD,INPUT {
-    font-size: 9pt; 
-}
-
-BODY {
-    margin: 0px 0px 0px 0px;
-}
-
-</style>
-</head>
-<body>
-<center>
-<p><form ENCTYPE="text/plain" onSubmit="return submitForms()"></center>
-<TABLE bgcolor="#C0C0C0">
-<TR>
-<TD>
-<TABLE width="100%" height="100%">
-  <TR>
-    <TD>Name:</TD>
-    <TD width="100%"><input type="text" name="addrTo" ></TD>
-  </TR>
-  <TR>
-    <TD>Password:</TD>
-    <TD><input type="text" name="subject" id="subject"></TD>
-  </TR>
-</TABLE>
-</TD>
-</TR>
-</TABLE>
-<input type=button value=" Ok " onClick="window.close();">
-</form>
-</center>
-
-</body>
-</html>
--- a/xpfe/AppCores/xul/resources/.cvsignore
+++ b/xpfe/AppCores/xul/resources/.cvsignore
@ -1,2 +0,0 @@
-.xvpics
-
--- a/xpfe/AppCores/xul/resources/DialogAddrIcon.gif
+++ b/xpfe/AppCores/xul/resources/DialogAddrIcon.gif
--- a/xpfe/AppCores/xul/resources/DialogAddrIcon_mo.gif
+++ b/xpfe/AppCores/xul/resources/DialogAddrIcon_mo.gif
--- a/xpfe/AppCores/xul/resources/DialogCompIcon.gif
+++ b/xpfe/AppCores/xul/resources/DialogCompIcon.gif
--- a/xpfe/AppCores/xul/resources/DialogCompIcon_mo.gif
+++ b/xpfe/AppCores/xul/resources/DialogCompIcon_mo.gif
--- a/xpfe/AppCores/xul/resources/DialogMailIcon.gif
+++ b/xpfe/AppCores/xul/resources/DialogMailIcon.gif
--- a/xpfe/AppCores/xul/resources/DialogMailIcon_mo.gif
+++ b/xpfe/AppCores/xul/resources/DialogMailIcon_mo.gif
--- a/xpfe/AppCores/xul/resources/DialogNavIcon.gif
+++ b/xpfe/AppCores/xul/resources/DialogNavIcon.gif
--- a/xpfe/AppCores/xul/resources/DialogNavIcon_mo.gif
+++ b/xpfe/AppCores/xul/resources/DialogNavIcon_mo.gif
--- a/xpfe/AppCores/xul/resources/Mail_Forward.gif
+++ b/xpfe/AppCores/xul/resources/Mail_Forward.gif
--- a/xpfe/AppCores/xul/resources/Mail_GetMsg.gif
+++ b/xpfe/AppCores/xul/resources/Mail_GetMsg.gif
--- a/xpfe/AppCores/xul/resources/Mail_NewMsg.gif
+++ b/xpfe/AppCores/xul/resources/Mail_NewMsg.gif
--- a/xpfe/AppCores/xul/resources/Mail_Reply.gif
+++ b/xpfe/AppCores/xul/resources/Mail_Reply.gif
--- a/xpfe/AppCores/xul/resources/Mail_SendMsg.gif
+++ b/xpfe/AppCores/xul/resources/Mail_SendMsg.gif
--- a/xpfe/AppCores/xul/resources/StatusBar-insecure.gif
+++ b/xpfe/AppCores/xul/resources/StatusBar-insecure.gif
--- a/xpfe/AppCores/xul/resources/StatusBar-secure.gif
+++ b/xpfe/AppCores/xul/resources/StatusBar-secure.gif
--- a/xpfe/AppCores/xul/resources/TB_Back.gif
+++ b/xpfe/AppCores/xul/resources/TB_Back.gif
--- a/xpfe/AppCores/xul/resources/TB_Back_dis.gif
+++ b/xpfe/AppCores/xul/resources/TB_Back_dis.gif
--- a/xpfe/AppCores/xul/resources/TB_Back_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_Back_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_Bookmarks.gif
+++ b/xpfe/AppCores/xul/resources/TB_Bookmarks.gif
--- a/xpfe/AppCores/xul/resources/TB_Bookmarks_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_Bookmarks_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_Edit.gif
+++ b/xpfe/AppCores/xul/resources/TB_Edit.gif
--- a/xpfe/AppCores/xul/resources/TB_EditPage.gif
+++ b/xpfe/AppCores/xul/resources/TB_EditPage.gif
--- a/xpfe/AppCores/xul/resources/TB_Forward.gif
+++ b/xpfe/AppCores/xul/resources/TB_Forward.gif
--- a/xpfe/AppCores/xul/resources/TB_Forward_dis.gif
+++ b/xpfe/AppCores/xul/resources/TB_Forward_dis.gif
--- a/xpfe/AppCores/xul/resources/TB_Forward_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_Forward_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_HTab.gif
+++ b/xpfe/AppCores/xul/resources/TB_HTab.gif
--- a/xpfe/AppCores/xul/resources/TB_HTab_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_HTab_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_Home.gif
+++ b/xpfe/AppCores/xul/resources/TB_Home.gif
--- a/xpfe/AppCores/xul/resources/TB_Home_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_Home_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_LoadImages.gif
+++ b/xpfe/AppCores/xul/resources/TB_LoadImages.gif
--- a/xpfe/AppCores/xul/resources/TB_Location.gif
+++ b/xpfe/AppCores/xul/resources/TB_Location.gif
--- a/xpfe/AppCores/xul/resources/TB_Location_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_Location_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_MiniAddr.gif
+++ b/xpfe/AppCores/xul/resources/TB_MiniAddr.gif
--- a/xpfe/AppCores/xul/resources/TB_MiniComp.gif
+++ b/xpfe/AppCores/xul/resources/TB_MiniComp.gif
--- a/xpfe/AppCores/xul/resources/TB_MiniMail.gif
+++ b/xpfe/AppCores/xul/resources/TB_MiniMail.gif
--- a/xpfe/AppCores/xul/resources/TB_MiniNav.gif
+++ b/xpfe/AppCores/xul/resources/TB_MiniNav.gif
--- a/xpfe/AppCores/xul/resources/TB_MiniTab.gif
+++ b/xpfe/AppCores/xul/resources/TB_MiniTab.gif
--- a/xpfe/AppCores/xul/resources/TB_MixSecurity.gif
+++ b/xpfe/AppCores/xul/resources/TB_MixSecurity.gif
--- a/xpfe/AppCores/xul/resources/TB_Netscape.gif
+++ b/xpfe/AppCores/xul/resources/TB_Netscape.gif
--- a/xpfe/AppCores/xul/resources/TB_Netscape_mo.gif
+++ b/xpfe/AppCores/xul/resources/TB_Netscape_mo.gif
--- a/xpfe/AppCores/xul/resources/TB_NewBack.gif
+++ b/xpfe/AppCores/xul/resources/TB_NewBack.gif
--- a/xpfe/AppCores/xul/resources/TB_NewForward.gif
+++ b/xpfe/AppCores/xul/resources/TB_NewForward.gif
--- a/xpfe/AppCores/xul/resources/TB_NewHome.gif
+++ b/xpfe/AppCores/xul/resources/TB_NewHome.gif
--- a/Показать больше
+++ b/Показать больше