diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
deleted file mode 100644
index 89349a1db5e..00000000000
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ /dev/null
@@ -1,360 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%brandDTD;
-
-%buildDTD;
-
-%navigatorDTD;
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/xpfe/components/history/src/nsSHEntry.cpp b/mozilla/xpfe/components/history/src/nsSHEntry.cpp
deleted file mode 100644
index 52c63770fbb..00000000000
--- a/mozilla/xpfe/components/history/src/nsSHEntry.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is the Mozilla browser.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc. Portions created by Netscape are
- * Copyright (C) 1999, Mozilla. All Rights Reserved.
- *
- * Contributor(s):
- * Radha Kulkarni
- * Pierre Phaneuf
- */
-#include "nsISupportsUtils.h"
-//#include "nsCOMPtr.h"
-#include "nsIDOMDocument.h"
-#include "nsSHEntry.h"
-
-#ifdef XXX_NS_DEBUG // XXX: we'll need a logging facility for debugging
-#define WEB_TRACE(_bit,_args) \
- PR_BEGIN_MACRO \
- if (WEB_LOG_TEST(gLogModule,_bit)) { \
- PR_LogPrint _args; \
- } \
- PR_END_MACRO
-#else
-#define WEB_TRACE(_bit,_args)
-#endif
-
-//*****************************************************************************
-//*** nsSHEnumerator: Object Management
-//*****************************************************************************
-class nsSHEnumerator : public nsIEnumerator
-{
-public:
-
- NS_DECL_ISUPPORTS
-
- NS_DECL_NSIENUMERATOR
- NS_IMETHOD CurrentItem(nsISHEntry ** aItem);
-
-private:
- friend class nsSHEntry;
-
- nsSHEnumerator(nsSHEntry * aEntry);
- virtual ~nsSHEnumerator();
-
- PRInt32 mIndex;
- nsSHEntry * mSHEntry;
-};
-
-
-
-//*****************************************************************************
-//*** nsSHEntry: Object Management
-//*****************************************************************************
-
-nsSHEntry::nsSHEntry()
-{
-
-NS_INIT_REFCNT();
-mURI = (nsnull);
-mPostData = (nsnull);
-mDocument= (nsnull);
-mLayoutHistoryState= (nsnull);
-
-}
-
-
-NS_IMETHODIMP
-nsSHEntry::Create(nsIURI * aURI, const PRUnichar * aTitle, nsIDOMDocument * aDOMDocument,
- nsIInputStream * aInputStream, nsISupports * aHistoryLayoutState)
-{
- SetUri(aURI);
- SetTitle(aTitle);
- SetDocument(aDOMDocument);
- SetPostData(aInputStream);
- SetLayoutHistoryState(aHistoryLayoutState);
- return NS_OK;
-
-}
-
-
-nsSHEntry::~nsSHEntry()
-{
- NS_IF_RELEASE(mURI);
- NS_IF_RELEASE(mPostData);
- NS_IF_RELEASE(mDocument);
- NS_IF_RELEASE(mLayoutHistoryState);
- if (mTitle)
- delete mTitle;
-
- DestroyChildren();
-}
-
-void
-nsSHEntry::DestroyChildren() {
-
- PRInt32 i, n;
-
- n = GetChildCount(&n);
- for (i = 0; i < n; i++) {
- nsISHEntry* child = (nsISHEntry *) mChildren.ElementAt(i);
- child->SetParent(nsnull); // Weak reference to parent
- delete child;
- }
- mChildren.Clear();
-
-
-}
-
-// nsSHEntry::nsISupports
-
-NS_IMPL_ISUPPORTS2(nsSHEntry, nsISHEntry, nsISHContainer)
-
-NS_IMETHODIMP
-nsSHEntry::GetUri(nsIURI **aUri)
-{
- NS_ENSURE_ARG_POINTER(aUri);
-
- *aUri = mURI;
- NS_IF_ADDREF(mURI);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetUri(nsIURI * aUri)
-{
-
- NS_IF_RELEASE(mURI);
- mURI = aUri;
- NS_IF_ADDREF(mURI);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetDocument(nsIDOMDocument * aDocument)
-{
- NS_IF_RELEASE(mDocument);
- mDocument = aDocument;
- NS_IF_ADDREF(mDocument);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetDocument(nsIDOMDocument ** aResult)
-{
- NS_ENSURE_ARG_POINTER(aResult);
- *aResult = mDocument;
- NS_IF_ADDREF(mDocument);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetTitle(PRUnichar** aTitle)
-{
- NS_ENSURE_ARG_POINTER(aTitle);
- if (mTitle)
- *aTitle = mTitle->ToNewUnicode();
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetTitle(const PRUnichar* aTitle)
-{
-
- if (mTitle)
- delete mTitle;
- if (aTitle)
- mTitle = new nsString(aTitle);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetPostData(nsIInputStream ** aResult)
-{
- NS_ENSURE_ARG_POINTER(aResult);
- *aResult = mPostData;
- NS_IF_ADDREF(mPostData);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetPostData(nsIInputStream * aPostData)
-{
- NS_IF_RELEASE(mPostData);
- mPostData = aPostData;
- NS_IF_ADDREF(aPostData);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetLayoutHistoryState(nsISupports ** aResult)
-{
- NS_ENSURE_ARG_POINTER(aResult);
- *aResult = mLayoutHistoryState;
- NS_IF_ADDREF(mLayoutHistoryState);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::SetLayoutHistoryState(nsISupports * aState)
-{
- NS_IF_RELEASE(mLayoutHistoryState);
- mLayoutHistoryState = aState;
- NS_IF_ADDREF(aState);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetParent(nsISHEntry ** aResult)
-{
- NS_ENSURE_ARG_POINTER(aResult);
- *aResult = mParent;
- NS_IF_ADDREF(*aResult);
- return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSHEntry::SetParent(nsISHEntry * aParent)
-{
- /* parent not Addrefed on purpose to avoid cyclic reference
- * Null parent is OK
- */
- mParent = aParent;
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::GetChildCount(PRInt32 * aCount)
-{
- NS_ENSURE_ARG_POINTER(aCount);
- *aCount = mChildren.Count();
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::AddChild(nsISHEntry * aChild)
-{
- NS_ENSURE_ARG_POINTER(aChild);
-
- NS_ENSURE_SUCCESS(aChild->SetParent(this), NS_ERROR_FAILURE);
- mChildren.AppendElement((void *)aChild);
- NS_ADDREF(aChild);
-
- return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSHEntry::RemoveChild(nsISHEntry * aChild)
-{
- NS_ENSURE_ARG_POINTER(aChild);
- PRBool childRemoved = mChildren.RemoveElement((void *)aChild);
- if (childRemoved) {
- aChild->SetParent(nsnull);
- NS_RELEASE(aChild);
- }
- return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSHEntry::GetChildEnumerator(nsIEnumerator** aChildEnumerator)
-{
- nsresult status = NS_OK;
-
- NS_ENSURE_ARG_POINTER(aChildEnumerator);
- nsSHEnumerator * iterator = new nsSHEnumerator(this);
- if (iterator && !!NS_SUCCEEDED(status = CallQueryInterface(iterator, aChildEnumerator)))
- delete iterator;
- return status;
-}
-
-
-//*****************************************************************************
-//*** nsSHEnumerator: Object Management
-//*****************************************************************************
-
-nsSHEnumerator::nsSHEnumerator(nsSHEntry * aEntry):mIndex(0)
-{
- NS_INIT_REFCNT();
- mSHEntry = aEntry;
-}
-
-nsSHEnumerator::~nsSHEnumerator()
-{
-}
-
-
-NS_IMETHODIMP
-nsSHEnumerator::Next()
-{
- mIndex++;
- PRUint32 cnt=0;
- cnt = mSHEntry->mChildren.Count();
- if (mIndex < (PRInt32)cnt)
- return NS_OK;
- return NS_ERROR_FAILURE;
-}
-
-
-#if 0
-NS_IMETHODIMP
-nsSHEnumerator::Prev()
-{
- mIndex--;
- if (mIndex >= 0 )
- return NS_OK;
- return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsSHEnumerator::Last()
-{
- PRUint32 cnt;
- nsresult rv = mSHEntry->mChildren.Count(&cnt);
- if (NS_FAILED(rv)) return rv;
- mIndex = (PRInt32)cnt-1;
- return NS_OK;
-}
-#endif /* 0 */
-
-NS_IMETHODIMP
-nsSHEnumerator::First()
-{
- mIndex = 0;
- return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsSHEnumerator::CurrentItem(nsISupports **aItem)
-{
- if (!aItem)
- return NS_ERROR_NULL_POINTER;
- PRUint32 cnt= mSHEntry->mChildren.Count();
- if (mIndex >=0 && mIndex < (PRInt32)cnt){
- *aItem = (nsISupports *)mSHEntry->mChildren.ElementAt(mIndex);
- NS_IF_ADDREF(*aItem);
- return NS_OK;
- }
- return NS_ERROR_FAILURE;
-}
-
-NS_IMPL_ISUPPORTS1(nsSHEnumerator, nsIEnumerator)
-
-
-NS_IMETHODIMP
-nsSHEnumerator::CurrentItem(nsISHEntry **aItem)
-{
- if (!aItem)
- return NS_ERROR_NULL_POINTER;
- PRUint32 cnt = mSHEntry->mChildren.Count();
- if (mIndex >=0 && mIndex < (PRInt32)cnt){
- nsCOMPtr indexIsupports = (nsISHEntry *) mSHEntry->mChildren.ElementAt(mIndex);
- return indexIsupports->QueryInterface(NS_GET_IID(nsISHEntry),(void **)aItem);
- }
- return NS_ERROR_FAILURE;
-}
-
-
-
-NS_IMETHODIMP
-nsSHEnumerator::IsDone()
-{
- PRUint32 cnt;
- cnt = mSHEntry->mChildren.Count();
- if (mIndex >= 0 && mIndex < (PRInt32)cnt ) {
- return NS_ENUMERATOR_FALSE;
- }
- return NS_OK;
-}
-
-
-#if 0
-NS_IMETHODIMP
-nsRangeListIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
- if (nsnull == aInstancePtr) {
- return NS_ERROR_NULL_POINTER;
- }
- if (aIID.Equals(NS_GET_IID(nsIEnumerator))) {
- *aInstancePtr = NS_STATIC_CAST(nsIEnumerator*, this);
- NS_ADDREF_THIS();
- return NS_OK;
- }
- if (aIID.Equals(NS_GET_IID(nsIBidirectionalEnumerator))) {
- *aInstancePtr = NS_STATIC_CAST(nsIBidirectionalEnumerator*, this);
- NS_ADDREF_THIS();
- return NS_OK;
- }
- return mDomSelection->QueryInterface(aIID, aInstancePtr);
-}
-#endif
-
-////////////END nsSHEnumerator methods
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
deleted file mode 100644
index 3b6705d0aac..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-%brandDTD;
-
-%prefCookieDTD;
-]>
-
-
-
-
-
-
-
-
-
-
- &cookieDetails;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-images.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-images.xul
deleted file mode 100644
index fe7cc35cbe0..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-images.xul
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-
-
-
-%brandDTD;
-
-%prefImagesDTD;
-]>
-
-
-
-
-
-
-
-
-
-
-
-
- &imageDetails;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-passwords.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-passwords.xul
deleted file mode 100644
index 4c27485595b..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-passwords.xul
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-%brandDTD;
-
-%prefWalletDTD;
-]>
-
-
-
-
-
-
-
-
- &signonDescription.label;
-
-
-
-
-
-
-
-
-
-
- &encryptDescription.label;
-
-
-
-
-
-
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
deleted file mode 100644
index 2bfa93aa991..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-%brandDTD;
-
-%prefWalletDTD;
-]>
-
-
-
-
-
-
-
-
- &walletDescription.label;
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js b/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
deleted file mode 100644
index b783441d526..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: Java; 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):
- * Alec Flett
- * Jason Eager
- */
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-const nsIFileURL = Components.interfaces.nsIFileURL;
-
-function getFileOrFolderSpec( aTitle, aFolder )
-{
- try {
- var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
- }
- catch(e) {
- dump("*** failed to create fileSpecWithUI or fileSpec objects\n");
- return false;
- }
-
- try {
- var mode;
- if (aFolder)
- mode = nsIFilePicker.modeGetFolder;
- else
- mode = nsIFilePicker.modeOpen;
-
- fp.init(window, aTitle, mode);
- fp.appendFilters(nsIFilePicker.filterAll);
- var ret = fp.show();
- if (ret == nsIFilePicker.returnCancel)
- return -1;
- }
- catch(e) {
- dump("Error: " + e + "\n");
- return -1;
- }
-
- return fp.file;
-}
-
-function prefNavSelectFile(folderFieldId, stringId, useNative)
-{
- var folderField = document.getElementById(folderFieldId);
- var dlgString = stringId ? bundle.GetStringFromName(stringId) : '';
- var file = getFileOrFolderSpec( dlgString, false );
- if( file != -1 )
- {
- /* XXX nsILocalFile doesn't have a URL string */
- if (useNative)
- {
- folderField.value = file.unicodePath;
- }
- else
- {
- try {
- var fileURL = Components.classes["@mozilla.org/network/standard-url;1"].createInstance(nsIFileURL);
- fileURL.file = file;
- var url = fileURL.spec;
- if( url )
- folderField.value = url;
- }
- catch(e) {
- }
- }
- }
-}
-
-function setHomePageToCurrentPage(folderFieldId)
-{
- var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"].getService(Components.interfaces.nsIWindowMediator);
- var browserWindow = windowManager.getMostRecentWindow("navigator:browser");
- if (browserWindow) {
- var browser = browserWindow.document.getElementById("content");
- var url = browser.webNavigation.currentURI.spec;
- if (url) {
- var homePageField = document.getElementById(folderFieldId);
- homePageField.value = url;
- }
- }
-}
-
-function prefClearGlobalHistory()
-{
- var globalHistory = Components.classes["@mozilla.org/browser/global-history;1"].getService(Components.interfaces.nsIBrowserHistory);
- if (globalHistory)
- globalHistory.removeAllPages();
-}
-
-function prefClearUrlbarHistory()
-{
- var button = document.getElementById("ClearUrlBarHistoryButton");
- var urlBarHist = Components.classes["@mozilla.org/browser/urlbarhistory;1"].getService(Components.interfaces.nsIUrlbarHistory);
- if ( urlBarHist )
- {
- urlBarHist.clearHistory();
- button.setAttribute("disabled","true");
- }
-}
-
-var bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
-