From cbe71d171e47693f4d05fefddc25051f5b948134 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Fri, 7 Aug 2020 18:00:33 -0400
Subject: [PATCH] [Navigator] Remove Shell Service and Windows Installer

This will be replaced with more contemporary versions in a future series of commits.

tl;dr NOW I HAVE TO DO IT, DAMN IT!
---
 navigator/Makefile.in                         |    2 +
 navigator/components/build/nsModule.cpp       |   36 -
 navigator/components/moz.build                |    2 +-
 .../shell/content/defaultClientDialog.js      |   62 -
 .../shell/content/defaultClientDialog.xul     |   37 -
 .../shell/content/setDesktopBackground.js     |   73 --
 .../shell/content/setDesktopBackground.xul    |   50 -
 navigator/components/shell/jar.mn             |   14 -
 .../shell/locale/defaultClientDialog.dtd      |   14 -
 .../shell/locale/setDesktopBackground.dtd     |   19 -
 .../shell/locale/shellservice.properties      |    7 -
 navigator/components/shell/moz.build          |   40 -
 .../components/shell/nsSetDefault.manifest    |    3 -
 .../shell/public/nsIShellService.idl          |  113 --
 .../shell/public/nsIWindowsShellService.idl   |   18 -
 .../shell/src/nsGNOMEShellService.cpp         |  498 --------
 .../shell/src/nsGNOMEShellService.h           |   39 -
 .../shell/src/nsMacShellService.cpp           |  457 --------
 .../components/shell/src/nsMacShellService.h  |   39 -
 .../components/shell/src/nsSetDefault.js      |   54 -
 .../components/shell/src/nsShellService.h     |   13 -
 .../shell/src/nsWindowsShellService.cpp       |  939 ---------------
 .../shell/src/nsWindowsShellService.h         |   45 -
 navigator/installer/package-manifest.in       |   17 +-
 navigator/installer/windows/Makefile.in       |   74 --
 navigator/installer/windows/app.tag           |    4 -
 .../windows/locale/custom.properties          |   90 --
 .../installer/windows/locale/mui.properties   |   64 -
 .../windows/locale/override.properties        |   86 --
 navigator/installer/windows/moz.build         |   13 -
 navigator/installer/windows/nsis/custom.nsi   |  137 ---
 .../installer/windows/nsis/defines.nsi.in     |   46 -
 .../installer/windows/nsis/installer.nsi      | 1042 ----------------
 navigator/installer/windows/nsis/shared.nsh   | 1044 -----------------
 .../installer/windows/nsis/uninstaller.nsi    |  573 ---------
 .../installer/windows/nsis/updater_append.ini |   16 -
 navigator/moz.build                           |    4 +-
 37 files changed, 7 insertions(+), 5777 deletions(-)
 delete mode 100644 navigator/components/shell/content/defaultClientDialog.js
 delete mode 100644 navigator/components/shell/content/defaultClientDialog.xul
 delete mode 100644 navigator/components/shell/content/setDesktopBackground.js
 delete mode 100644 navigator/components/shell/content/setDesktopBackground.xul
 delete mode 100644 navigator/components/shell/jar.mn
 delete mode 100644 navigator/components/shell/locale/defaultClientDialog.dtd
 delete mode 100644 navigator/components/shell/locale/setDesktopBackground.dtd
 delete mode 100644 navigator/components/shell/locale/shellservice.properties
 delete mode 100644 navigator/components/shell/moz.build
 delete mode 100644 navigator/components/shell/nsSetDefault.manifest
 delete mode 100644 navigator/components/shell/public/nsIShellService.idl
 delete mode 100644 navigator/components/shell/public/nsIWindowsShellService.idl
 delete mode 100644 navigator/components/shell/src/nsGNOMEShellService.cpp
 delete mode 100644 navigator/components/shell/src/nsGNOMEShellService.h
 delete mode 100644 navigator/components/shell/src/nsMacShellService.cpp
 delete mode 100644 navigator/components/shell/src/nsMacShellService.h
 delete mode 100644 navigator/components/shell/src/nsSetDefault.js
 delete mode 100644 navigator/components/shell/src/nsShellService.h
 delete mode 100644 navigator/components/shell/src/nsWindowsShellService.cpp
 delete mode 100644 navigator/components/shell/src/nsWindowsShellService.h
 delete mode 100644 navigator/installer/windows/Makefile.in
 delete mode 100644 navigator/installer/windows/app.tag
 delete mode 100644 navigator/installer/windows/locale/custom.properties
 delete mode 100644 navigator/installer/windows/locale/mui.properties
 delete mode 100644 navigator/installer/windows/locale/override.properties
 delete mode 100644 navigator/installer/windows/moz.build
 delete mode 100644 navigator/installer/windows/nsis/custom.nsi
 delete mode 100644 navigator/installer/windows/nsis/defines.nsi.in
 delete mode 100644 navigator/installer/windows/nsis/installer.nsi
 delete mode 100644 navigator/installer/windows/nsis/shared.nsh
 delete mode 100644 navigator/installer/windows/nsis/uninstaller.nsi
 delete mode 100644 navigator/installer/windows/nsis/updater_append.ini

diff --git a/navigator/Makefile.in b/navigator/Makefile.in
index 0afeeea4..a1035b04 100644
--- a/navigator/Makefile.in
+++ b/navigator/Makefile.in
@@ -5,12 +5,14 @@
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef 0
 ifdef MAKENSISU
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
 endif
+endif
 
 
 # As a fallout from bug 1247162, the sourcestamp in application.ini and
diff --git a/navigator/components/build/nsModule.cpp b/navigator/components/build/nsModule.cpp
index c6d2df49..f14b7da4 100644
--- a/navigator/components/build/nsModule.cpp
+++ b/navigator/components/build/nsModule.cpp
@@ -9,59 +9,23 @@
 #include "nsRDFCID.h"
 #include "nsFeedSniffer.h"
 
-#if defined(XP_WIN)
-#include "nsWindowsShellService.h"
-#elif defined(XP_MACOSX)
-#include "nsMacShellService.h"
-#elif defined(MOZ_WIDGET_GTK)
-#include "nsGNOMEShellService.h"
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(XP_WIN)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowsShellService, Init)
-#elif defined(XP_MACOSX)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
-#elif defined(MOZ_WIDGET_GTK)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
-#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSuiteDirectoryProvider)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
-#if defined(NS_SUITEWININTEGRATION_CID)
-NS_DEFINE_NAMED_CID(NS_SUITEWININTEGRATION_CID);
-#elif defined(NS_SUITEMACINTEGRATION_CID)
-NS_DEFINE_NAMED_CID(NS_SUITEMACINTEGRATION_CID);
-#elif defined(NS_SUITEGNOMEINTEGRATION_CID)
-NS_DEFINE_NAMED_CID(NS_SUITEGNOMEINTEGRATION_CID);
-#endif
 NS_DEFINE_NAMED_CID(NS_SUITEDIRECTORYPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_FEEDSNIFFER_CID);
 
 /////////////////////////////////////////////////////////////////////////////
 
 static const mozilla::Module::CIDEntry kSuiteCIDs[] = {
-#if defined(NS_SUITEWININTEGRATION_CID)
-  { &kNS_SUITEWININTEGRATION_CID, false, NULL, nsWindowsShellServiceConstructor },
-#elif defined(NS_SUITEMACINTEGRATION_CID)
-  { &kNS_SUITEMACINTEGRATION_CID, false, NULL, nsMacShellServiceConstructor },
-#elif defined(NS_SUITEGNOMEINTEGRATION_CID)
-  { &kNS_SUITEGNOMEINTEGRATION_CID, false, NULL, nsGNOMEShellServiceConstructor },
-#endif
   { &kNS_SUITEDIRECTORYPROVIDER_CID, false, NULL, nsSuiteDirectoryProviderConstructor },
   { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
   { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kSuiteContracts[] = {
-#if defined(NS_SUITEWININTEGRATION_CID)
-  { NS_SUITESHELLSERVICE_CONTRACTID, &kNS_SUITEWININTEGRATION_CID },
-#elif defined(NS_SUITEMACINTEGRATION_CID)
-  { NS_SUITESHELLSERVICE_CONTRACTID, &kNS_SUITEMACINTEGRATION_CID },
-#elif defined(NS_SUITEGNOMEINTEGRATION_CID)
-  { NS_SUITESHELLSERVICE_CONTRACTID, &kNS_SUITEGNOMEINTEGRATION_CID },
-#endif
   { NS_SUITEDIRECTORYPROVIDER_CONTRACTID, &kNS_SUITEDIRECTORYPROVIDER_CID },
   { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID },
   { NULL }
diff --git a/navigator/components/moz.build b/navigator/components/moz.build
index 70961fbe..5ee13dea 100644
--- a/navigator/components/moz.build
+++ b/navigator/components/moz.build
@@ -16,7 +16,7 @@ DIRS += [
     'preferences',
     'search',
     'sessionstore',
-    'shell',
+#    'shell',
     'sidebar',
     'smile',
 ]
diff --git a/navigator/components/shell/content/defaultClientDialog.js b/navigator/components/shell/content/defaultClientDialog.js
deleted file mode 100644
index 06ff137c..00000000
--- a/navigator/components/shell/content/defaultClientDialog.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// this dialog can only be opened if we have a shell service
-const nsIShellService = Components.interfaces.nsIShellService;
-const nsIPrefBranch = Components.interfaces.nsIPrefBranch;
-
-function onLoad()
-{
-  var shellSvc = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                           .getService(nsIShellService);
-  var defaultList = document.getElementById("defaultList");
-  var appTypes = shellSvc.shouldBeDefaultClientFor;
-  /* Iterate through the list of possible default client types and check for
-     each list item if we want to be the default for that type using the AND
-     conjunction */
-  for (var i = 0; i < defaultList.getRowCount(); i++) {
-    var currentItem = defaultList.getItemAtIndex(i);
-    try {
-      if (shellSvc.isDefaultClient(false, nsIShellService[currentItem.value])) {
-        currentItem.checked = true;
-        currentItem.disabled = true;
-      }
-      else if (nsIShellService[currentItem.value] & appTypes)
-        currentItem.checked = true;
-    } catch (e) {
-      currentItem.hidden = true;
-    }
-  }
-}
-
-function onAccept()
-{
-  // for each checked item, if we aren't already the default, make us the default.
-  var shellSvc = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                           .getService(nsIShellService);
-  var appTypes = 0;
-  var appTypesCheck = 0;
-  var defaultList = document.getElementById("defaultList");
-
-  for (var i = 0; i < defaultList.getRowCount(); i++) {
-    var currentItem = defaultList.getItemAtIndex(i);
-    var currentAppType = nsIShellService[currentItem.value];
-
-    if (currentItem.checked) {
-      appTypesCheck |= currentAppType;
-
-      if (!currentItem.disabled)
-        appTypes |= currentAppType;
-    }
-  }
-
-  if (appTypes)
-    shellSvc.setDefaultClient(false, true, appTypes);
-
-  // Update the pref for which app types we should check if we are the default app
-  shellSvc.shouldBeDefaultClientFor = appTypesCheck;
-
-  shellSvc.shouldCheckDefaultClient = document.getElementById('checkOnStartup').checked;
-}
diff --git a/navigator/components/shell/content/defaultClientDialog.xul b/navigator/components/shell/content/defaultClientDialog.xul
deleted file mode 100644
index fb9acf2d..00000000
--- a/navigator/components/shell/content/defaultClientDialog.xul
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-
-<!DOCTYPE window [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  %brandDTD;
-  <!ENTITY % defaultClientDTD SYSTEM "chrome://communicator/locale/defaultClientDialog.dtd" >
-  %defaultClientDTD;
-]>
-
-<dialog xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="defaultClientDialog"
-        buttons="accept,cancel"
-        onload="onLoad();"
-        ondialogaccept="return onAccept();"
-        title="&defaultClient.title;">
-
-  <script type="application/javascript" src="chrome://communicator/content/defaultClientDialog.js"/>
-
-  <description>&defaultClient.intro;</description>
-  <listbox rows="4" id="defaultList">
-    <listitem value="BROWSER" type="checkbox" label="&browser.label;"/>
-    <listitem value="MAIL" type="checkbox" label="&email.label;" disabled="true"/>
-    <listitem value="NEWS" type="checkbox" label="&newsgroups.label;" disabled="true"/>
-    <listitem value="RSS" type="checkbox" label="&feeds.label;" disabled="true"/>
-  </listbox>
-
-  <separator class="thin"/>
-  <checkbox id="checkOnStartup" checked="true" label="&checkOnStartup.label;" accesskey="&checkOnStartup.accesskey;"/>
-
-</dialog>
diff --git a/navigator/components/shell/content/setDesktopBackground.js b/navigator/components/shell/content/setDesktopBackground.js
deleted file mode 100644
index b9c91c40..00000000
--- a/navigator/components/shell/content/setDesktopBackground.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const nsIShellService = Components.interfaces.nsIShellService;
-var gShell = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                       .getService(nsIShellService);
-
-var gImage, gPosition, gPicker, gDesktop;
-
-function onLoad()
-{
-  document.getElementById("itemsBox").hidden = /Mac/.test(navigator.platform);
-  gImage = window.arguments[0];
-  gPosition = document.getElementById("position");
-  gPicker = document.getElementById("picker");
-  gDesktop = document.getElementById("desktop");
-
-  sizeToContent();
-  window.innerWidth += screen.width / 2 - gDesktop.boxObject.width;
-  window.innerHeight += screen.height / 2 - gDesktop.boxObject.height;
-
-  try {
-    var color = gShell.desktopBackgroundColor;
-    color = (0xF000000 | color).toString(16).toUpperCase().replace("F", "#");
-    gDesktop.style.backgroundColor = color;
-    gPicker.color = color;
-  } catch (e) {
-    gPicker.parentNode.hidden = true;
-  }
-
-  gDesktop.style.backgroundImage = 'url("' + gImage.src + '")';
-
-  updatePosition();
-}
-
-function onApply()
-{
-  if (!gPicker.parentNode.hidden)
-    gShell.desktopBackgroundColor = parseInt(gPicker.color.substr(1), 16);
-
-  gShell.setDesktopBackground(gImage, nsIShellService[gPosition.value]);
-}
-
-function updatePosition()
-{
-  gDesktop.style.backgroundPosition = "center";
-  gDesktop.style.backgroundRepeat = "no-repeat";
-  switch (gPosition.value) {
-    case "BACKGROUND_FIT":
-      gDesktop.style.backgroundSize = "contain";
-      return;
-    case "BACKGROUND_FILL":
-      gDesktop.style.backgroundSize = "cover";
-      return;
-    case "BACKGROUND_STRETCH":
-      gDesktop.style.backgroundPosition = "";
-      gDesktop.style.backgroundSize = "100% 100%";
-      return;
-    case "BACKGROUND_TILE":
-      gDesktop.style.backgroundPosition = "";
-      gDesktop.style.backgroundRepeat = "repeat";
-  }
-  gDesktop.style.backgroundSize =
-    (gImage.naturalWidth / 2) + "px " + (gImage.naturalHeight / 2) + "px";
-}
-
-function updateColor()
-{
-  gDesktop.style.backgroundColor = gPicker.color;
-}
diff --git a/navigator/components/shell/content/setDesktopBackground.xul b/navigator/components/shell/content/setDesktopBackground.xul
deleted file mode 100644
index 4e0b7a70..00000000
--- a/navigator/components/shell/content/setDesktopBackground.xul
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/setDesktopBackground.dtd">
-
-<dialog id="setDesktopBackground"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="onLoad();"
-        buttons="accept,extra2"
-        buttoniconaccept="close"
-        buttonlabelaccept="&close.label;"
-        buttoniconextra2="apply"
-        buttonlabelextra2="&apply.label;"
-        buttonaccesskeyextra2="&apply.accesskey;"
-        ondialogextra2="onApply();"
-        title="&setDesktopBackground.title;">
-
-  <script type="text/javascript"
-          src="chrome://communicator/content/setDesktopBackground.js"/>
-
-  <hbox id="itemsBox" align="center">
-    <label value="&position.label;" accesskey="&position.accesskey;"/>
-    <menulist id="position"
-              value="BACKGROUND_STRETCH"
-              persist="value"
-              oncommand="updatePosition();">
-      <menupopup>
-        <menuitem value="BACKGROUND_TILE" label="&position.tile.label;"/>
-        <menuitem value="BACKGROUND_STRETCH" label="&position.stretch.label;"/>
-        <menuitem value="BACKGROUND_CENTER" label="&position.center.label;"/>
-        <menuitem value="BACKGROUND_FILL" label="&position.fill.label;"/>
-        <menuitem value="BACKGROUND_FIT" label="&position.fit.label;"/>
-      </menupopup>
-    </menulist>
-    <hbox flex="1" pack="end">
-      <label value="&picker.label;" accesskey="&picker.accesskey;"/>
-      <colorpicker id="picker" type="button" onchange="updateColor();"/>
-    </hbox>
-  </hbox>
-
-  <groupbox flex="1">
-    <caption label="&preview.caption;"/>
-    <spacer id="desktop" flex="1"/>
-  </groupbox>
-</dialog>
diff --git a/navigator/components/shell/jar.mn b/navigator/components/shell/jar.mn
deleted file mode 100644
index d1b30d5c..00000000
--- a/navigator/components/shell/jar.mn
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-comm.jar:
-  content/communicator/defaultClientDialog.js          (content/defaultClientDialog.js)
-  content/communicator/defaultClientDialog.xul         (content/defaultClientDialog.xul)
-  content/communicator/setDesktopBackground.js         (content/setDesktopBackground.js)
-  content/communicator/setDesktopBackground.xul        (content/setDesktopBackground.xul)
-
-en-US.jar:
-  locale/en-US/communicator/defaultClientDialog.dtd    (locale/defaultClientDialog.dtd)
-  locale/en-US/communicator/shellservice.properties    (locale/shellservice.properties)
-  locale/en-US/communicator/setDesktopBackground.dtd   (locale/setDesktopBackground.dtd)
\ No newline at end of file
diff --git a/navigator/components/shell/locale/defaultClientDialog.dtd b/navigator/components/shell/locale/defaultClientDialog.dtd
deleted file mode 100644
index 850ecc1c..00000000
--- a/navigator/components/shell/locale/defaultClientDialog.dtd
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY defaultClient.title  "Default Client">
-<!ENTITY defaultClient.intro  "Use &brandShortName; as the default client for:">
-
-<!ENTITY browser.label "Navigator">
-<!ENTITY email.label "E-Mail">
-<!ENTITY newsgroups.label "Newsgroups">
-<!ENTITY feeds.label "Feeds">
-
-<!ENTITY checkOnStartup.label "Always perform this check when starting &brandShortName;">
-<!ENTITY checkOnStartup.accesskey "A">
diff --git a/navigator/components/shell/locale/setDesktopBackground.dtd b/navigator/components/shell/locale/setDesktopBackground.dtd
deleted file mode 100644
index 59d952fe..00000000
--- a/navigator/components/shell/locale/setDesktopBackground.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY setDesktopBackground.title "Set Desktop Background">
-
-<!ENTITY position.label             "Position:">
-<!ENTITY position.accesskey         "P">
-<!ENTITY position.tile.label        "Tile">
-<!ENTITY position.stretch.label     "Stretch">
-<!ENTITY position.center.label      "Center">
-<!ENTITY position.fill.label        "Fill">
-<!ENTITY position.fit.label         "Fit">
-<!ENTITY picker.label               "Color:">
-<!ENTITY picker.accesskey           "C">
-<!ENTITY preview.caption            "Preview">
-<!ENTITY apply.label                "Apply">
-<!ENTITY apply.accesskey            "A">
-<!ENTITY close.label                "Close">
diff --git a/navigator/components/shell/locale/shellservice.properties b/navigator/components/shell/locale/shellservice.properties
deleted file mode 100644
index 885ddf9a..00000000
--- a/navigator/components/shell/locale/shellservice.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-preferencesLabel=%S &Preferences
-safeModeLabel=%S &Safe Mode
-desktopBackgroundLeafNameWin=Desktop Background.bmp
diff --git a/navigator/components/shell/moz.build b/navigator/components/shell/moz.build
deleted file mode 100644
index 01ad7265..00000000
--- a/navigator/components/shell/moz.build
+++ /dev/null
@@ -1,40 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'public/nsIShellService.idl',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    XPIDL_SOURCES += [
-        'public/nsIWindowsShellService.idl',
-    ]
-
-XPIDL_MODULE = 'shellservice'
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += ['src/nsWindowsShellService.cpp']
-    OS_LIBS += [
-        'ole32',
-        'version',
-        'uuid',
-        'shell32',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += ['src/nsMacShellService.cpp']
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    SOURCES += ['src/nsGNOMEShellService.cpp']
-
-if SOURCES:
-    EXTRA_COMPONENTS += [
-        'nsSetDefault.manifest',
-        'src/nsSetDefault.js',
-    ]
-
-FINAL_LIBRARY = 'navigatorcomps'
-
-CXXFLAGS += CONFIG['TK_CFLAGS']
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/navigator/components/shell/nsSetDefault.manifest b/navigator/components/shell/nsSetDefault.manifest
deleted file mode 100644
index ba5c12ad..00000000
--- a/navigator/components/shell/nsSetDefault.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-component {a3d5b950-690a-491f-a881-2c2cdcd241cb} nsSetDefault.js
-contract @binaryoutcast.com/navigator/default-browser-clh;1 {a3d5b950-690a-491f-a881-2c2cdcd241cb}
-category command-line-handler m-setdefault @binaryoutcast.com/navigator/default-browser-clh;1
diff --git a/navigator/components/shell/public/nsIShellService.idl b/navigator/components/shell/public/nsIShellService.idl
deleted file mode 100644
index fd0bdf88..00000000
--- a/navigator/components/shell/public/nsIShellService.idl
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#include "nsISupports.idl"
-
-interface nsIDOMElement;
-interface nsIFile;
-
-[scriptable, uuid(4244d99e-0fbf-4cf3-903a-893634704e84)]
-interface nsIShellService : nsISupports
-{
-  /**
-   * app types we can be registered to handle
-   */
-  const unsigned short BROWSER = 0x0001;
-  const unsigned short MAIL    = 0x0002;
-  const unsigned short NEWS    = 0x0004;
-  const unsigned short RSS     = 0x0008;
-
-  /**
-   * Determines whether or not SeaMonkey is the "Default Client" for the
-   * passed in app type.
-   *
-   * This is simply whether or not SeaMonkey is registered to handle
-   * the url schemes associated with the app.
-   *
-   * @param aStartupCheck true if this is the check being performed
-   *                      by the first window at startup,
-   *                      false otherwise.
-   * @param aApps the application types being tested (Browser, Mail, News, RSS)
-   */
-  boolean isDefaultClient(in boolean aStartupCheck, in unsigned short aApps);
-
-  /**
-   * Registers SeaMonkey as the "Default Client" for the
-   * passed in app types.
-   *
-   * @param aForAllUsers   Whether or not SeaMonkey should attempt
-   *                       to become the default client for all
-   *                       users on a multi-user system.
-   * @param aClaimAllTypes Register SeaMonkey as the handler for
-   *                       additional protocols (ftp, chrome etc)
-   *                       and web documents (.html, .xhtml etc).
-   * @param aApps the application types being tested (Mail, News, Browser, RSS)
-   */
-  void setDefaultClient(in boolean aForAllUsers, in boolean aClaimAllTypes, in unsigned short aApps);
-
-  /**
-   * Used to determine whether or not to show a "Set Default Client"
-   * query dialog. This attribute is true if the application is starting
-   * up and "shell.checkDefaultClient" is true, otherwise it
-   * is false.
-   */
-  attribute boolean shouldCheckDefaultClient;
-
-
-  /**
-   * Returns the appTypes constants we should be the default client for.
-   * Saves/reads the default apps to/from the pref shell.checkDefaultApps
-   */
-  attribute unsigned short shouldBeDefaultClientFor;
-
-  /**
-   * Attempt to determine whether it is possible to change the wallpaper.
-   */
-  readonly attribute boolean canSetDesktopBackground;
-
-  /**
-   * Sets the desktop background image using either the HTML <IMG>
-   * element supplied or the background image of the element supplied.
-   *
-   * @param aImageElement Either a HTML <IMG> element or an element with
-   *                      a background image from which to source the
-   *                      background image.
-   * @param aPosition     How to place the image on the desktop
-   */
-
-  void setDesktopBackground(in nsIDOMElement aElement, in long aPosition);
-
-  /**
-   * Flags for positioning/sizing of the Desktop Background image.
-   */
-  const long BACKGROUND_TILE      = 1;
-  const long BACKGROUND_STRETCH   = 2;
-  const long BACKGROUND_CENTER    = 3;
-  const long BACKGROUND_FILL      = 4;
-  const long BACKGROUND_FIT       = 5;
-
-  /**
-   * The desktop background color, visible when no background image is
-   * used, or if the background image is centered and does not fill the
-   * entire screen. An RGB value (r << 16 | g << 8 | b)
-   */
-  attribute unsigned long desktopBackgroundColor;
-
-  /**
-   * Opens an application with a specific URI to load.
-   * @param   application
-   *          The application file (or bundle directory, on OS X)
-   * @param   uri
-   *          The uri to be loaded by the application
-   */
-  void openApplicationWithURI(in nsIFile aApplication, in ACString aURI);
-
-  /**
-   * The default system handler for web feeds
-   */
-  readonly attribute nsIFile defaultFeedReader;
-};
-
diff --git a/navigator/components/shell/public/nsIWindowsShellService.idl b/navigator/components/shell/public/nsIWindowsShellService.idl
deleted file mode 100644
index efa3ded3..00000000
--- a/navigator/components/shell/public/nsIWindowsShellService.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIShellService.idl"
-
-[scriptable, uuid(16e7e8da-8bef-4f41-be5f-045b2e9918e1)]
-interface nsIWindowsShellService : nsIShellService
-{
-    /**
-     * Provides the shell service an opportunity to do some Win7+ shortcut
-     * maintenance needed on initial startup of the browser.
-     */
-    void shortcutMaintenance();
-};
-
-
diff --git a/navigator/components/shell/src/nsGNOMEShellService.cpp b/navigator/components/shell/src/nsGNOMEShellService.cpp
deleted file mode 100644
index 6134aaa9..00000000
--- a/navigator/components/shell/src/nsGNOMEShellService.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsCOMPtr.h"
-#include "nsComponentManagerUtils.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsDirectoryServiceUtils.h"
-#include "nsGNOMEShellService.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIGSettingsService.h"
-#include "nsIGConfService.h"
-#include "nsIGIOService.h"
-#include "nsIPrefService.h"
-#include "nsIStringBundle.h"
-#include "nsIImageLoadingContent.h"
-#include "nsIDOMElement.h"
-#include "imgIRequest.h"
-#include "imgIContainer.h"
-#include "nsIImageToPixbuf.h"
-#include "nsIFile.h"
-#include "nsIProcess.h"
-#include "prenv.h"
-#include "mozilla/ArrayUtils.h"
-#include "nsXULAppAPI.h"
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-// GConf registry key constants
-#define DG_BACKGROUND "/desktop/gnome/background"
-
-#define DGB_OPTIONS DG_BACKGROUND "/picture_options"
-#define DGB_IMAGE DG_BACKGROUND "/picture_filename"
-#define DGB_DRAWBG DG_BACKGROUND "/draw_background"
-#define DGB_COLOR DG_BACKGROUND "/primary_color"
-
-#define OGDB_SCHEMA "org.gnome.desktop.background"
-#define OGDB_OPTIONS "picture-options"
-#define OGDB_IMAGE "picture-uri"
-#define OGDB_DRAWBG "draw-background"
-#define OGDB_COLOR "primary-color"
-
-struct ProtocolAssociation {
-  uint16_t app;
-  const char* protocol;
-};
-
-struct MimeTypeAssociation {
-  uint16_t app;
-  const char* mimeType;
-  const char* extensions;
-};
-
-static const ProtocolAssociation gProtocols[] = {
-  { nsIShellService::BROWSER, "http" },
-  { nsIShellService::BROWSER, "https" },
-  { nsIShellService::MAIL, "mailto" },
-  { nsIShellService::NEWS, "news" },
-  { nsIShellService::NEWS, "snews" },
-  { nsIShellService::RSS, "feed" }
-};
-
-static const MimeTypeAssociation gMimeTypes[] = {
-  { nsIShellService::BROWSER, "text/html", "htm html" },
-  { nsIShellService::BROWSER, "application/xhtml+xml", "xhtml" },
-  { nsIShellService::MAIL, "message/rfc822", "eml" },
-  { nsIShellService::RSS, "application/rss+xml", "rss" }
-};
-
-NS_IMPL_ISUPPORTS(nsGNOMEShellService, nsIShellService)
-
-nsresult
-GetBrandName(nsACString& aBrandName)
-{
-  // get the product brand name from localized strings
-  nsresult rv;
-  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService("@mozilla.org/intl/stringbundle;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIStringBundle> brandBundle;
-  rv = bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle));
-  NS_ENSURE_TRUE(brandBundle, rv);
-
-  nsString brandName;
-  rv = brandBundle->GetStringFromName(u"brandShortName",
-                                      getter_Copies(brandName));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  CopyUTF16toUTF8(brandName, aBrandName);
-  return rv;
-}
-
-nsresult
-nsGNOMEShellService::Init()
-{
-  nsresult rv;
-
-  // Check G_BROKEN_FILENAMES.  If it's set, then filenames in glib use
-  // the locale encoding.  If it's not set, they use UTF-8.
-  mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nullptr;
-
-  const char* launcher = PR_GetEnv("MOZ_APP_LAUNCHER");
-  if (launcher) {
-    if (g_path_is_absolute(launcher)) {
-      mAppPath = launcher;
-      gchar* basename = g_path_get_basename(launcher);
-      gchar* fullpath = g_find_program_in_path(basename);
-      mAppIsInPath = fullpath && mAppPath.Equals(fullpath);
-      g_free(fullpath);
-      g_free(basename);
-      return NS_OK;
-    }
-
-    gchar* fullpath = g_find_program_in_path(launcher);
-    if (fullpath) {
-      mAppPath = fullpath;
-      mAppIsInPath = true;
-      g_free(fullpath);
-      return NS_OK;
-    }
-  }
-
-  nsCOMPtr<nsIFile> appPath;
-  rv = NS_GetSpecialDirectory(XRE_EXECUTABLE_FILE, getter_AddRefs(appPath));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return appPath->GetNativePath(mAppPath);
-}
-
-bool
-nsGNOMEShellService::HandlerMatchesAppName(const char* aHandler)
-{
-  bool matches = false;
-  gint argc;
-  gchar** argv;
-  if (g_shell_parse_argv(aHandler, &argc, &argv, nullptr) && argc > 0) {
-    gchar* command = nullptr;
-    if (!mUseLocaleFilenames)
-      command = g_find_program_in_path(argv[0]);
-    else {
-      gchar* nativeFile = g_filename_from_utf8(argv[0], -1,
-                                               nullptr, nullptr, nullptr);
-      if (nativeFile) {
-        command = g_find_program_in_path(nativeFile);
-        g_free(nativeFile);
-      }
-    }
-    matches = command && mAppPath.Equals(command);
-    g_free(command);
-    g_strfreev(argv);
-  }
-
-  return matches;
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::IsDefaultClient(bool aStartupCheck, uint16_t aApps,
-                                     bool* aIsDefaultClient)
-{
-  if (aStartupCheck)
-    mCheckedThisSessionClient = true;
-
-  *aIsDefaultClient = false;
-  nsCString handler;
-  nsCOMPtr<nsIGIOMimeApp> app;
-  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-
-  for (unsigned i = 0; i < mozilla::ArrayLength(gProtocols); i++) {
-    if (aApps & gProtocols[i].app) {
-      nsDependentCString protocol(gProtocols[i].protocol);
-      if (giovfs) {
-        giovfs->GetAppForURIScheme(protocol, getter_AddRefs(app));
-        if (!app)
-          return NS_OK;
-
-        if (NS_SUCCEEDED(app->GetCommand(handler)) &&
-            !HandlerMatchesAppName(handler.get()))
-         return NS_OK;
-      }
-
-      bool enabled;
-      if (gconf &&
-          NS_SUCCEEDED(gconf->GetAppForProtocol(protocol, &enabled, handler)) &&
-          (!enabled || !HandlerMatchesAppName(handler.get())))
-        return NS_OK;
-    }
-  }
-
-  *aIsDefaultClient = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::SetDefaultClient(bool aForAllUsers,
-                                      bool aClaimAllTypes, uint16_t aApps)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsIGIOMimeApp> app;
-  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  if (giovfs) {
-    nsCString brandName;
-    rv = GetBrandName(brandName);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = giovfs->CreateAppFromCommand(mAppPath, brandName, getter_AddRefs(app));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    for (unsigned i = 0; i < mozilla::ArrayLength(gMimeTypes); i++) {
-      if (aApps & gMimeTypes[i].app) {
-        rv = app->SetAsDefaultForMimeType(nsDependentCString(gMimeTypes[i].mimeType));
-        NS_ENSURE_SUCCESS(rv, rv);
-        rv = app->SetAsDefaultForFileExtensions(nsDependentCString(gMimeTypes[i].extensions));
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-    }
-  }
-
-  nsCString appKeyValue;
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (gconf) {
-    if (!mAppIsInPath)
-      appKeyValue = mAppPath;
-    else {
-      gchar* basename = g_path_get_basename(mAppPath.get());
-      appKeyValue = basename;
-      g_free(basename);
-    }
-    appKeyValue.AppendLiteral(" %s");
-  }
-
-  for (unsigned i = 0; i < mozilla::ArrayLength(gProtocols); i++) {
-    if (aApps & gProtocols[i].app) {
-      nsDependentCString protocol(gProtocols[i].protocol);
-      if (app) {
-        rv = app->SetAsDefaultForURIScheme(protocol);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-      if (gconf) {
-        rv = gconf->SetAppForProtocol(protocol, appKeyValue);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::GetShouldCheckDefaultClient(bool* aResult)
-{
-  if (mCheckedThisSessionClient) {
-    *aResult = false;
-    return NS_OK;
-  }
-
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->GetBoolPref(PREF_CHECKDEFAULTCLIENT, aResult);
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::SetShouldCheckDefaultClient(bool aShouldCheck)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->SetBoolPref(PREF_CHECKDEFAULTCLIENT, aShouldCheck);
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::GetShouldBeDefaultClientFor(uint16_t* aApps)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  int32_t result;
-  rv = prefs->GetIntPref("shell.checkDefaultApps", &result);
-  *aApps = result;
-  return rv;
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::SetShouldBeDefaultClientFor(uint16_t aApps)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->SetIntPref("shell.checkDefaultApps", aApps);
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::GetCanSetDesktopBackground(bool* aResult)
-{
-  nsCOMPtr<nsIGConfService> gconf(do_GetService(NS_GCONFSERVICE_CONTRACTID));
-  *aResult = gconf && getenv("GNOME_DESKTOP_SESSION_ID");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
-                                          int32_t aPosition)
-{
-  nsCString brandName;
-  nsresult rv = GetBrandName(brandName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // build the file name
-  nsCString filePath(PR_GetEnv("HOME"));
-  filePath.Append('/');
-  filePath.Append(brandName);
-  filePath.AppendLiteral("_wallpaper.png");
-
-  // get the image container
-  nsCOMPtr<nsIImageLoadingContent> imageContent(do_QueryInterface(aElement, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<imgIRequest> request;
-  rv = imageContent->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
-                                getter_AddRefs(request));
-  NS_ENSURE_TRUE(request, rv);
-
-  nsCOMPtr<imgIContainer> container;
-  rv = request->GetImage(getter_AddRefs(container));
-  NS_ENSURE_TRUE(request, rv);
-
-  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf(do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"));
-  if (!imgToPixbuf)
-    return NS_ERROR_NOT_AVAILABLE;
-
-  GdkPixbuf* pixbuf = imgToPixbuf->ConvertImageToPixbuf(container);
-  if (!pixbuf)
-    return NS_ERROR_NOT_AVAILABLE;
-
-  // write the image to a file in the home dir
-  gboolean res = gdk_pixbuf_save(pixbuf, filePath.get(), "png",
-                                 nullptr, nullptr);
-
-  g_object_unref(pixbuf);
-  if (!res)
-    return NS_ERROR_FAILURE;
-
-  // set desktop wallpaper filling style
-  const char* options;
-  switch (aPosition) {
-    case BACKGROUND_TILE:
-      options = "wallpaper";
-      break;
-    case BACKGROUND_STRETCH:
-      options = "stretched";
-      break;
-    case BACKGROUND_FILL:
-      options = "zoom";
-      break;
-    case BACKGROUND_FIT:
-      options = "scaled";
-      break;
-    default:
-      options = "centered";
-      break;
-  }
-
-  // Try GSettings first. If we don't have GSettings or the right schema, fall back
-  // to using GConf instead. Note that if GSettings works ok, the changes get
-  // mirrored to GConf by the gsettings->gconf bridge in gnome-settings-daemon
-  nsCOMPtr<nsIGSettingsService> gsettings(do_GetService(NS_GSETTINGSSERVICE_CONTRACTID));
-  if (gsettings) {
-    nsCOMPtr<nsIGSettingsCollection> background_settings;
-    gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(OGDB_SCHEMA),
-                                      getter_AddRefs(background_settings));
-    if (background_settings) {
-      gchar *file_uri = g_filename_to_uri(filePath.get(), nullptr, nullptr);
-      if (!file_uri)
-       return NS_ERROR_FAILURE;
-
-      background_settings->SetString(NS_LITERAL_CSTRING(OGDB_OPTIONS),
-                                     nsDependentCString(options));
-      background_settings->SetString(NS_LITERAL_CSTRING(OGDB_IMAGE),
-                                     nsDependentCString(file_uri));
-      g_free(file_uri);
-      background_settings->SetBoolean(NS_LITERAL_CSTRING(OGDB_DRAWBG), true);
-      return NS_OK;
-    }
-  }
-
-  // if the file was written successfully, set it as the system wallpaper
-  nsCOMPtr<nsIGConfService> gconf(do_GetService(NS_GCONFSERVICE_CONTRACTID));
-
-  if (gconf) {
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_OPTIONS), nsDependentCString(options));
-
-    // Set the image to an empty string first to force a refresh (since we could
-    // be writing a new image on top of an existing SeaMonkey_wallpaper.png
-    // and nautilus doesn't monitor the file for changes).
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_IMAGE), EmptyCString());
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_IMAGE), filePath);
-    gconf->SetBool(NS_LITERAL_CSTRING(DGB_DRAWBG), true);
-  }
-
-  return NS_OK;
-}
-
-#define COLOR_16_TO_8_BIT(_c) ((_c) >> 8)
-
-NS_IMETHODIMP
-nsGNOMEShellService::GetDesktopBackgroundColor(uint32_t *aColor)
-{
-  nsCOMPtr<nsIGSettingsService> gsettings(do_GetService(NS_GSETTINGSSERVICE_CONTRACTID));
-  nsCOMPtr<nsIGSettingsCollection> background_settings;
-
-  if (gsettings)
-    gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(OGDB_SCHEMA),
-                                      getter_AddRefs(background_settings));
-
-  nsCString background;
-  if (background_settings)
-    background_settings->GetString(NS_LITERAL_CSTRING(OGDB_COLOR),
-                                   background);
-  else {
-    nsCOMPtr<nsIGConfService> gconf(do_GetService(NS_GCONFSERVICE_CONTRACTID));
-    if (gconf)
-      gconf->GetString(NS_LITERAL_CSTRING(DGB_COLOR), background);
-  }
-
-  if (background.IsEmpty())
-    return NS_ERROR_FAILURE;
-
-  GdkColor color;
-  NS_ENSURE_TRUE(gdk_color_parse(background.get(), &color), NS_ERROR_FAILURE);
-
-  *aColor = COLOR_16_TO_8_BIT(color.red) << 16 |
-            COLOR_16_TO_8_BIT(color.green) << 8 |
-            COLOR_16_TO_8_BIT(color.blue);
-  return NS_OK;
-}
-
-#define COLOR_8_TO_16_BIT(_c) ((_c) << 8 | (_c))
-
-NS_IMETHODIMP
-nsGNOMEShellService::SetDesktopBackgroundColor(uint32_t aColor)
-{
-  NS_ENSURE_ARG_MAX(aColor, 0xFFFFFF);
-
-  uint8_t red = aColor >> 16;
-  uint8_t green = aColor >> 8;
-  uint8_t blue = aColor;
-  char colorString[14];
-  sprintf(colorString, "#%04x%04x%04x", COLOR_8_TO_16_BIT(red),
-          COLOR_8_TO_16_BIT(green), COLOR_8_TO_16_BIT(blue));
-
-  nsCOMPtr<nsIGSettingsService> gsettings(do_GetService(NS_GSETTINGSSERVICE_CONTRACTID));
-  if (gsettings) {
-    nsCOMPtr<nsIGSettingsCollection> background_settings;
-    gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(OGDB_SCHEMA),
-                                      getter_AddRefs(background_settings));
-    if (background_settings) {
-      background_settings->SetString(NS_LITERAL_CSTRING(OGDB_COLOR),
-                                     nsDependentCString(colorString));
-      return NS_OK;
-    }
-  }
-
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (gconf)
-    gconf->SetString(NS_LITERAL_CSTRING(DGB_COLOR), nsDependentCString(colorString));
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-{
-  nsresult rv;
-  nsCOMPtr<nsIProcess> process =
-    do_CreateInstance("@mozilla.org/process/util;1", &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = process->Init(aApplication);
-  if (NS_FAILED(rv))
-    return rv;
-
-  const nsCString& spec = PromiseFlatCString(aURI);
-  const char* specStr = spec.get();
-  return process->Run(false, &specStr, 1);
-}
-
-NS_IMETHODIMP
-nsGNOMEShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
diff --git a/navigator/components/shell/src/nsGNOMEShellService.h b/navigator/components/shell/src/nsGNOMEShellService.h
deleted file mode 100644
index bf9f4b30..00000000
--- a/navigator/components/shell/src/nsGNOMEShellService.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsgnomeshellservice_h____
-#define nsgnomeshellservice_h____
-
-#include "nsShellService.h"
-#include "nsStringGlue.h"
-#include "mozilla/Attributes.h"
-
-#define NS_SUITEGNOMEINTEGRATION_CID \
-{0xc16cfa25, 0xa74a, 0x420b, {0xa5, 0x45, 0x4b, 0xc0, 0x6b, 0x08, 0xa8, 0x65}}
-
-struct ProtocolAssociation;
-
-class nsGNOMEShellService final : public nsIShellService
-{
-public:
-  nsGNOMEShellService() : mCheckedThisSessionClient(false) { }
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHELLSERVICE
-
-  nsresult Init();
-
-private:
-  ~nsGNOMEShellService() {}
-  bool HandlerMatchesAppName(const char* aHandler);
-
-  nsCString mAppPath;
-  bool mAppIsInPath;
-  bool mUseLocaleFilenames;
-  bool mCheckedThisSessionClient;
-};
-
-#endif // nsgnomeshellservice_h____
-
diff --git a/navigator/components/shell/src/nsMacShellService.cpp b/navigator/components/shell/src/nsMacShellService.cpp
deleted file mode 100644
index 87ebdd05..00000000
--- a/navigator/components/shell/src/nsMacShellService.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsCOMPtr.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIImageLoadingContent.h"
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsILocalFileMac.h"
-#include "nsIObserverService.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
-#include "nsIStringBundle.h"
-#include "nsIURL.h"
-#include "nsIWebBrowserPersist.h"
-#include "nsMacShellService.h"
-#include "nsNetUtil.h"
-#include "nsShellService.h"
-#include "nsStringAPI.h"
-#include "nsIDocShell.h"
-#include "nsILoadContext.h"
-#include "nsIProperties.h"
-#include "nsServiceManagerUtils.h"
-
-#include <ApplicationServices/ApplicationServices.h>
-
-#define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"
-
-NS_IMPL_ISUPPORTS(nsMacShellService, nsIShellService, nsIWebProgressListener)
-
-NS_IMETHODIMP
-nsMacShellService::IsDefaultClient(bool aStartupCheck, uint16_t aApps, bool *aIsDefaultClient)
-{
-  // If this is the first window, maintain internal state that we've
-  // checked this session (so that subsequent window opens don't show the
-  // default client dialog).
-  if (aStartupCheck)
-    mCheckedThisSessionClient = true;
-
-  *aIsDefaultClient = false;
-
-  if (aApps & nsIShellService::BROWSER)
-    if(!isDefaultHandlerForProtocol(CFSTR("http")))
-      return NS_OK;
-  if (aApps & nsIShellService::MAIL)
-    if(!isDefaultHandlerForProtocol(CFSTR("mailto")))
-      return NS_OK;
-  if (aApps & nsIShellService::NEWS)
-    if(!isDefaultHandlerForProtocol(CFSTR("news")))
-      return NS_OK;
-  if (aApps & nsIShellService::RSS)
-    if(!isDefaultHandlerForProtocol(CFSTR("feed")))
-      return NS_OK;
-
-  *aIsDefaultClient = true;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDefaultClient(bool aForAllUsers,
-                                    bool aClaimAllTypes, uint16_t aApps)
-{
-  // Note: We don't support aForAllUsers on Mac OS X.
-
-  CFStringRef suiteID = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
-  if (!suiteID)
-    return NS_ERROR_FAILURE;
-
-  if (aApps & nsIShellService::BROWSER)
-  {
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("http"), suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("https"), suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-    if (::LSSetDefaultRoleHandlerForContentType(kUTTypeHTML, kLSRolesAll, suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-    if (::LSSetDefaultRoleHandlerForContentType(CFSTR("public.xhtml"), kLSRolesAll, suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-  }
-
-  if (aApps & nsIShellService::MAIL)
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("mailto"), suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-  if (aApps & nsIShellService::NEWS)
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("news"), suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-  if (aApps & nsIShellService::RSS)
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("feed"), suiteID) != noErr)
-      return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetShouldCheckDefaultClient(bool* aResult)
-{
-  if (mCheckedThisSessionClient)
-  {
-    *aResult = false;
-    return NS_OK;
-  }
-
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->GetBoolPref(PREF_CHECKDEFAULTCLIENT, aResult);
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetShouldCheckDefaultClient(bool aShouldCheck)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->SetBoolPref(PREF_CHECKDEFAULTCLIENT, aShouldCheck);
-}
-
-bool
-nsMacShellService::isDefaultHandlerForProtocol(CFStringRef aScheme)
-{
-  bool isDefault = false;
-
-  CFStringRef suiteID = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
-  if (!suiteID)
-  {
-    // CFBundleGetIdentifier is expected to return nullptr only if the specified
-    // bundle doesn't have a bundle identifier in its dictionary. In this case,
-    // that means a failure, since our bundle does have an identifier.
-    return isDefault;
-  }
-
-  // Get the default handler's bundle ID for the scheme.
-  CFStringRef defaultHandlerID = ::LSCopyDefaultHandlerForURLScheme(aScheme);
-  if (defaultHandlerID)
-  {
-    // The handler ID in LaunchServices is in all lower case, but the bundle
-    // identifier could have upper case characters. So we're using
-    // CFStringCompare with the kCFCompareCaseInsensitive option here.
-    isDefault = ::CFStringCompare(suiteID, defaultHandlerID,
-                                  kCFCompareCaseInsensitive) == kCFCompareEqualTo;
-    ::CFRelease(defaultHandlerID);
-   }
-
-  return isDefault;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetShouldBeDefaultClientFor(uint16_t* aApps)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  int32_t result;
-  rv = prefs->GetIntPref("shell.checkDefaultApps", &result);
-  *aApps = result;
-  return rv;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetShouldBeDefaultClientFor(uint16_t aApps)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->SetIntPref("shell.checkDefaultApps", aApps);
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetCanSetDesktopBackground(bool* aResult)
-{
-  *aResult = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDesktopBackground(nsIDOMElement* aElement, int32_t aPosition)
-{
-  // Note: We don't support aPosition on OS X.
-
-  // Get the image URI:
-  nsresult rv;
-  nsCOMPtr<nsIImageLoadingContent> imageContent = do_QueryInterface(aElement, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIURI> imageURI;
-  rv = imageContent->GetCurrentURI(getter_AddRefs(imageURI));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // We need the referer URI for nsIWebBrowserPersist::saveURI.
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aElement, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsIURI *docURI = content->OwnerDoc()->GetDocumentURI();
-  if (!docURI)
-    return NS_ERROR_FAILURE;
-
-  // Get the desired image file name:
-  nsCOMPtr<nsIURL> imageURL(do_QueryInterface(imageURI));
-  if (!imageURL)
-  {
-    // XXXmano (bug 300293): Non-URL images (e.g. the data: protocol) are not
-    // yet supported. What filename should we take here?
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
-  nsAutoCString fileName;
-  imageURL->GetFileName(fileName);
-  nsCOMPtr<nsIProperties> fileLocator
-    (do_GetService("@mozilla.org/file/directory_service;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Get the current user's "Pictures" folder (That's ~/Pictures):
-  fileLocator->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile),
-                   getter_AddRefs(mBackgroundFile));
-  if (!mBackgroundFile)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  nsAutoString fileNameUnicode;
-  CopyUTF8toUTF16(fileName, fileNameUnicode);
-
-  // and add the image file name itself:
-  mBackgroundFile->Append(fileNameUnicode);
-
-  // Download the image; the desktop background will be set in OnStateChange():
-  nsCOMPtr<nsIWebBrowserPersist> wbp
-    (do_CreateInstance("@mozilla.org/embedding/browser/nsWebBrowserPersist;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t flags = nsIWebBrowserPersist::PERSIST_FLAGS_NO_CONVERSION |
-                   nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES |
-                   nsIWebBrowserPersist::PERSIST_FLAGS_FROM_CACHE;
-
-  wbp->SetPersistFlags(flags);
-  wbp->SetProgressListener(this);
-
-  nsCOMPtr<nsILoadContext> loadContext;
-  nsCOMPtr<nsISupports> container = content->OwnerDoc()->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-  if (docShell)
-  {
-    loadContext = do_QueryInterface(docShell);
-  }
-
-  return wbp->SaveURI(imageURI, nullptr, docURI,
-                      content->OwnerDoc()->GetReferrerPolicy(),
-                      nullptr, nullptr,
-                      mBackgroundFile, loadContext);
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnProgressChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    int32_t aCurSelfProgress,
-                                    int32_t aMaxSelfProgress,
-                                    int32_t aCurTotalProgress,
-                                    int32_t aMaxTotalProgress)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnLocationChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    nsIURI* aLocation,
-                                    uint32_t aFlags)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnStatusChange(nsIWebProgress* aWebProgress,
-                                  nsIRequest* aRequest,
-                                  nsresult aStatus,
-                                  const char16_t* aMessage)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnSecurityChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    uint32_t aState)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnStateChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 uint32_t aStateFlags,
-                                 nsresult aStatus)
-{
-  if (aStateFlags & STATE_STOP)
-  {
-    bool exists = false;
-    mBackgroundFile->Exists(&exists);
-    if (!exists)
-      return NS_OK;
-
-    nsAutoCString nativePath;
-    mBackgroundFile->GetNativePath(nativePath);
-
-    AEDesc tAEDesc = { typeNull, nil };
-    OSErr err = noErr;
-    AliasHandle aliasHandle = nil;
-    FSRef pictureRef;
-    OSStatus status;
-
-    // Convert the path into a FSRef:
-    status = ::FSPathMakeRef((const UInt8*)nativePath.get(), &pictureRef,
-                             nullptr);
-    if (status == noErr)
-    {
-      err = ::FSNewAlias(nil, &pictureRef, &aliasHandle);
-      if (err == noErr && aliasHandle == nil)
-        err = paramErr;
-
-      if (err == noErr)
-      {
-        // We need the descriptor (based on the picture file reference)
-        // for the 'Set Desktop Picture' apple event.
-        char handleState = ::HGetState((Handle)aliasHandle);
-        ::HLock((Handle)aliasHandle);
-        err = ::AECreateDesc(typeAlias, *aliasHandle,
-                             GetHandleSize((Handle)aliasHandle), &tAEDesc);
-        // Unlock the alias handler:
-        ::HSetState((Handle)aliasHandle, handleState);
-        ::DisposeHandle((Handle)aliasHandle);
-      }
-      if (err == noErr)
-      {
-        AppleEvent tAppleEvent;
-        OSType sig = 'MACS';
-        AEBuildError tAEBuildError;
-        // Create a 'Set Desktop Picture' Apple Event:
-        err = ::AEBuildAppleEvent(kAECoreSuite, kAESetData, typeApplSignature,
-                                  &sig, sizeof(OSType), kAutoGenerateReturnID,
-                                  kAnyTransactionID, &tAppleEvent, &tAEBuildError,
-                                  "'----':'obj '{want:type (prop),form:prop" \
-                                  ",seld:type('dpic'),from:'null'()},data:(@)",
-                                  &tAEDesc);
-        if (err == noErr)
-        {
-          AppleEvent reply = { typeNull, nil };
-          // Send the event we built, the reply event isn't necessary:
-          err = ::AESend(&tAppleEvent, &reply, kAENoReply, kAENormalPriority,
-                         kNoTimeOut, nil, nil);
-          ::AEDisposeDesc(&tAppleEvent);
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetDesktopBackgroundColor(uint32_t *aColor)
-{
-  // This method and |SetDesktopBackgroundColor| has no meaning on Mac OS X.
-  // The mac desktop preferences UI uses pictures for the few solid colors it
-  // supports.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDesktopBackgroundColor(uint32_t aColor)
-{
-  // This method and |GetDesktopBackgroundColor| has no meaning on Mac OS X.
-  // The mac desktop preferences UI uses pictures for the few solid colors it
-  // supports.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-{
-  nsCOMPtr<nsILocalFileMac> lfm(do_QueryInterface(aApplication));
-  CFURLRef appURL;
-  nsresult rv = lfm->GetCFURL(&appURL);
-  if (NS_FAILED(rv))
-    return rv;
-
-  const nsCString& spec = PromiseFlatCString(aURI);
-  const UInt8* uriString = (const UInt8*)spec.get();
-  CFURLRef uri = ::CFURLCreateWithBytes(nullptr, uriString, aURI.Length(),
-                                        kCFStringEncodingUTF8, nullptr);
-  if (!uri)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  CFArrayRef uris = ::CFArrayCreate(nullptr, (const void**)&uri, 1, nullptr);
-  if (!uris)
-  {
-    ::CFRelease(uri);
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  LSLaunchURLSpec launchSpec;
-  launchSpec.appURL = appURL;
-  launchSpec.itemURLs = uris;
-  launchSpec.passThruParams = nullptr;
-  launchSpec.launchFlags = kLSLaunchDefaults;
-  launchSpec.asyncRefCon = nullptr;
-
-  OSErr err = ::LSOpenFromURLSpec(&launchSpec, nullptr);
-
-  ::CFRelease(uris);
-  ::CFRelease(uri);
-
-  return err != noErr ? NS_ERROR_FAILURE : NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
-  nsresult rv = NS_ERROR_FAILURE;
-  *_retval = nullptr;
-
-  CFStringRef defaultHandlerID = ::LSCopyDefaultHandlerForURLScheme(CFSTR("feed"));
-  if (!defaultHandlerID)
-  {
-    defaultHandlerID = ::CFStringCreateWithCString(kCFAllocatorDefault,
-                                                   SAFARI_BUNDLE_IDENTIFIER,
-                                                   kCFStringEncodingASCII);
-  }
-
-  CFURLRef defaultHandlerURL = nullptr;
-  OSStatus status = ::LSFindApplicationForInfo(kLSUnknownCreator,
-                                               defaultHandlerID,
-                                               nullptr, // inName
-                                               nullptr, // outAppRef
-                                               &defaultHandlerURL);
-
-  if (status == noErr && defaultHandlerURL)
-  {
-    nsCOMPtr<nsILocalFileMac> defaultReader =
-      do_CreateInstance("@mozilla.org/file/local;1", &rv);
-    if (NS_SUCCEEDED(rv))
-    {
-      rv = defaultReader->InitWithCFURL(defaultHandlerURL);
-      if (NS_SUCCEEDED(rv))
-      {
-        NS_ADDREF(*_retval = defaultReader);
-      }
-    }
-
-    ::CFRelease(defaultHandlerURL);
-  }
-
-  ::CFRelease(defaultHandlerID);
-
-  return rv;
-}
diff --git a/navigator/components/shell/src/nsMacShellService.h b/navigator/components/shell/src/nsMacShellService.h
deleted file mode 100644
index 5dbd9ded..00000000
--- a/navigator/components/shell/src/nsMacShellService.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsmacshellservice_h____
-#define nsmacshellservice_h____
-
-#include "nsShellService.h"
-#include "nsIWebProgressListener.h"
-#include "nsIFile.h"
-#include "nsCOMPtr.h"
-#include "mozilla/Attributes.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#define NS_SUITEMACINTEGRATION_CID \
-{0xac17e6f0, 0x50c9, 0x4901, {0xab, 0x08, 0xf8, 0x70, 0xbf, 0xcd, 0x12, 0xce}}
-
-class nsMacShellService final : public nsIShellService,
-                                public nsIWebProgressListener
-{
-public:
-  nsMacShellService() : mCheckedThisSessionClient(false) {};
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHELLSERVICE
-  NS_DECL_NSIWEBPROGRESSLISTENER
-
-protected:
-  ~nsMacShellService() {}
-  bool isDefaultHandlerForProtocol(CFStringRef aScheme);
-
-private:
-  nsCOMPtr<nsIFile> mBackgroundFile;
-  bool mCheckedThisSessionClient;
-};
-
-#endif
diff --git a/navigator/components/shell/src/nsSetDefault.js b/navigator/components/shell/src/nsSetDefault.js
deleted file mode 100644
index e4f578c1..00000000
--- a/navigator/components/shell/src/nsSetDefault.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This component handles the startup command line arguments of the form:
- *   -setDefaultBrowser
- *   -setDefaultMail
- *   -setDefaultNews
- *   -setDefaultFeed
- */
-
-const nsIShellService = Components.interfaces.nsIShellService;
-const nsICommandLineHandler = Components.interfaces.nsICommandLineHandler;
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-function nsSetDefault() {
-}
-
-nsSetDefault.prototype = {
-  handle: function nsSetDefault_handle(aCmdline) {
-    if (aCmdline.handleFlag("setDefaultBrowser", false)) {
-      var shell = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                            .getService(nsIShellService);
-      shell.setDefaultClient(true, true, nsIShellService.BROWSER);
-    }
-    else if (aCmdline.handleFlag("setDefaultMail", false)) {
-      var shell = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                            .getService(nsIShellService);
-      shell.setDefaultClient(true, true, nsIShellService.MAIL);
-    }
-    else if (aCmdline.handleFlag("setDefaultNews", false)) {
-      var shell = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                            .getService(nsIShellService);
-      shell.setDefaultClient(true, true, nsIShellService.NEWS);
-    }
-    else if (aCmdline.handleFlag("setDefaultFeed", false)) {
-      var shell = Components.classes["@binaryoutcast.com/navigator/shell-service;1"]
-                            .getService(nsIShellService);
-      shell.setDefaultClient(true, true, nsIShellService.RSS);
-    }
-  },
-
-  helpInfo: "  -setDefaultBrowser Set this app as the default browser client.\n" +
-            "  -setDefaultMail    Set this app as the default mail client.\n" +
-            "  -setDefaultNews    Set this app as the default newsreader.\n" +
-            "  -setDefaultFeed    Set this app as the default feedreader.\n",
-
-  classID: Components.ID("{a3d5b950-690a-491f-a881-2c2cdcd241cb}"),
-  QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler])
-}
-
-var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSetDefault]);
-
diff --git a/navigator/components/shell/src/nsShellService.h b/navigator/components/shell/src/nsShellService.h
deleted file mode 100644
index 9289f9c7..00000000
--- a/navigator/components/shell/src/nsShellService.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIShellService.h"
-
-#define PREF_CHECKDEFAULTCLIENT "shell.checkDefaultClient"
-
-#define SHELLSERVICE_PROPERTIES "chrome://communicator/locale/shellservice.properties"
-#define BRAND_PROPERTIES "chrome://branding/locale/brand.properties"
-
-#define NS_SUITESHELLSERVICE_CONTRACTID "@binaryoutcast.com/navigator/shell-service;1"
diff --git a/navigator/components/shell/src/nsWindowsShellService.cpp b/navigator/components/shell/src/nsWindowsShellService.cpp
deleted file mode 100644
index d277d3e5..00000000
--- a/navigator/components/shell/src/nsWindowsShellService.cpp
+++ /dev/null
@@ -1,939 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "imgIContainer.h"
-#include "imgIRequest.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/RefPtr.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIImageLoadingContent.h"
-#include "nsIPrefService.h"
-#include "nsIPrefLocalizedString.h"
-#include "nsWindowsShellService.h"
-#include "nsIProcess.h"
-#include "windows.h"
-#include "nsIFile.h"
-#include "nsNetUtil.h"
-#include "nsNativeCharsetUtils.h"
-#include "nsUnicharUtils.h"
-#include "nsIStringBundle.h"
-#include "nsIServiceManager.h"
-#include "nsServiceManagerUtils.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsDirectoryServiceUtils.h"
-#include "nsIWindowsRegKey.h"
-#include "nsIWinTaskbar.h"
-#include "nsISupportsPrimitives.h"
-#include "nsXULAppAPI.h"
-#include <mbstring.h>
-#include "mozilla/Services.h"
-
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-#define INITGUID
-#include <shlobj.h>
-
-#ifndef MAX_BUF
-#define MAX_BUF 4096
-#endif
-
-#define REG_SUCCEEDED(val) \
-  (val == ERROR_SUCCESS)
-
-#define REG_FAILED(val) \
-  (val != ERROR_SUCCESS)
-
-#define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
-
-using namespace mozilla;
-using namespace mozilla::gfx;
-
-NS_IMPL_ISUPPORTS(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
-
-static nsresult
-OpenKeyForReading(HKEY aKeyRoot, const wchar_t* aKeyName, HKEY* aKey)
-{
-  DWORD res = ::RegOpenKeyExW(aKeyRoot, aKeyName, 0, KEY_READ, aKey);
-  switch (res) {
-  case ERROR_SUCCESS:
-   break;
-  case ERROR_ACCESS_DENIED:
-    return NS_ERROR_FILE_ACCESS_DENIED;
-  case ERROR_FILE_NOT_FOUND:
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  return NS_OK;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Default SeaMonkey OS integration Registry Settings
-// Note: Some settings only exist when using the installer!
-//       The setting of SeaMonkey as default application is made by a helper
-//       application since writing those values may require elevation.
-//
-// Default Browser settings:
-// - File Extension Mappings
-//   -----------------------
-//   The following file extensions:
-//    .htm .html .shtml .xht .xhtml
-//   are mapped like so:
-//
-//   HKCU\SOFTWARE\Classes\.<ext>\      (default)         REG_SZ   SeaMonkeyHTML
-//
-//   as aliases to the class:
-//
-//   HKCU\SOFTWARE\Classes\SeaMonkeyHTML\
-//     DefaultIcon                      (default)         REG_SZ     <appfolder>\chrome\icons\default\html-file.ico
-//     shell\open\command               (default)         REG_SZ     <apppath> -url "%1"
-//
-// - Windows Vista Protocol Handler
-//
-//   HKCU\SOFTWARE\Classes\SeaMonkeyURL\(default)         REG_SZ     <appname> URL
-//                                      EditFlags         REG_DWORD  2
-//                                      FriendlyTypeName  REG_SZ     <appname> URL
-//     DefaultIcon                      (default)         REG_SZ     <apppath>,1
-//     shell\open\command               (default)         REG_SZ     <apppath> -requestPending -osint -url "%1"
-//     shell\open\ddeexec               (default)         REG_SZ     "%1",,0,0,,,,
-//     shell\open\ddeexec               NoActivateHandler REG_SZ
-//                       \Application   (default)         REG_SZ     SeaMonkey
-//                       \Topic         (default)         REG_SZ     WWW_OpenURL
-//
-// - Protocol Mappings
-//   -----------------
-//   The following protocols:
-//    HTTP, HTTPS, FTP
-//   are mapped like so:
-//
-//   HKCU\SOFTWARE\Classes\<protocol>\
-//     DefaultIcon                      (default)         REG_SZ     <apppath>,0
-//     shell\open\command               (default)         REG_SZ     <apppath> -requestPending -osint -url "%1"
-//     shell\open\ddeexec               (default)         REG_SZ     "%1",,0,0,,,,
-//     shell\open\ddeexec               NoActivateHandler REG_SZ
-//                       \Application   (default)         REG_SZ     SeaMonkey
-//                       \Topic         (default)         REG_SZ     WWW_OpenURL
-//
-// - Windows Start Menu (Win2K SP2, XP SP1, and newer)
-//   -------------------------------------------------
-//   The following keys are set to make SeaMonkey appear in the Start Menu as the
-//   browser:
-//
-//   HKCU\SOFTWARE\Clients\StartMenuInternet\SEAMONKEY.EXE\
-//                                      (default)         REG_SZ     <appname>
-//     DefaultIcon                      (default)         REG_SZ     <apppath>,0
-//     InstallInfo                      HideIconsCommand  REG_SZ     <uninstpath> /HideShortcuts
-//     InstallInfo                      IconsVisible      REG_DWORD  1
-//     InstallInfo                      ReinstallCommand  REG_SZ     <uninstpath> /SetAsDefaultAppGlobal
-//     InstallInfo                      ShowIconsCommand  REG_SZ     <uninstpath> /ShowShortcuts
-//     shell\open\command               (default)         REG_SZ     <apppath>
-//     shell\properties                 (default)         REG_SZ     <appname> &Preferences
-//     shell\properties\command         (default)         REG_SZ     <apppath> -preferences
-//     shell\safemode                   (default)         REG_SZ     <appname> &Safe Mode
-//     shell\safemode\command           (default)         REG_SZ     <apppath> -safe-mode
-//
-//
-//
-// Default Mail&News settings
-//
-// - File Extension Mappings
-//   -----------------------
-//   The following file extension:
-//    .eml
-//   is mapped like this:
-//
-//   HKCU\SOFTWARE\Classes\.eml         (default)         REG_SZ    SeaMonkeyEML
-//
-//   That aliases to this class:
-//   HKCU\SOFTWARE\Classes\SeaMonkeyEML\ (default)        REG_SZ    SeaMonkey (Mail) Document
-//                                      FriendlyTypeName  REG_SZ    SeaMonkey (Mail) Document
-//     DefaultIcon                      (default)         REG_SZ    <appfolder>\chrome\icons\default\misc-file.ico
-//     shell\open\command               (default)         REG_SZ    <apppath> "%1"
-//
-// - Windows Vista Protocol Handler
-//
-//   HKCU\SOFTWARE\Classes\SeaMonkeyCOMPOSE (default)     REG_SZ    SeaMonkey (Mail) URL
-//                                       DefaultIcon      REG_SZ    <apppath>,0
-//                                       EditFlags        REG_DWORD 2
-//     shell\open\command                (default)        REG_SZ    <apppath> -osint -compose "%1"
-//
-//   HKCU\SOFTWARE\Classes\SeaMonkeyNEWS (default)        REG_SZ    SeaMonkey (News) URL
-//                                       DefaultIcon      REG_SZ    <apppath>,0
-//                                       EditFlags        REG_DWORD 2
-//     shell\open\command                (default)        REG_SZ    <apppath> -osint -news "%1"
-//
-//
-// - Protocol Mappings
-//   -----------------
-//   The following protocol:
-//    mailto
-//   is mapped like this:
-//
-//   HKCU\SOFTWARE\Classes\mailto\       (default)       REG_SZ     SeaMonkey (Mail) URL
-//                                       EditFlags       REG_DWORD  2
-//                                       URL Protocol    REG_SZ
-//    DefaultIcon                        (default)       REG_SZ     <apppath>,0
-//    shell\open\command                 (default)       REG_SZ     <apppath> -osint -compose "%1"
-//
-//   The following protocols:
-//    news,nntp,snews
-//   are mapped like this:
-//
-//   HKCU\SOFTWARE\Classes\<protocol>\   (default)       REG_SZ     SeaMonkey (News) URL
-//                                       EditFlags       REG_DWORD  2
-//                                       URL Protocol    REG_SZ
-//    DefaultIcon                        (default)       REG_SZ     <appath>,0
-//    shell\open\command                 (default)       REG_SZ     <appath> -osint -news "%1"
-//
-// - Windows Start Menu (Win2K SP2, XP SP1, and newer)
-//   -------------------------------------------------
-//   The following keys are set to make SeaMonkey appear in the Start Menu as
-//   the default mail program:
-//
-//   HKCU\SOFTWARE\Clients\Mail\SeaMonkey
-//                                   (default)           REG_SZ     <appname>
-//                                   DLLPath             REG_SZ     <appfolder>\mozMapi32.dll
-//    DefaultIcon                    (default)           REG_SZ     <apppath>,0
-//    InstallInfo                    HideIconsCommand    REG_SZ     <uninstpath> /HideShortcuts
-//    InstallInfo                    ReinstallCommand    REG_SZ     <uninstpath> /SetAsDefaultAppGlobal
-//    InstallInfo                    ShowIconsCommand    REG_SZ     <uninstpath> /ShowShortcuts
-//    shell\open\command             (default)           REG_SZ     <apppath> -mail
-//    shell\properties               (default)           REG_SZ     <appname> &Preferences
-//    shell\properties\command       (default)           REG_SZ     <apppath> -preferences
-//
-//   Also set SeaMonkey as News reader (Usenet), though Windows does currently
-//   not expose a default news reader to UI. Applications like Outlook Express
-//   also add themselves to this registry key
-//
-//   HKCU\SOFTWARE\Clients\News\SeaMonkey
-//                                   (default)           REG_SZ     <appname>
-//                                   DLLPath             REG_SZ     <appfolder>\mozMapi32.dll
-//    DefaultIcon                    (default)           REG_SZ     <apppath>,0
-//    shell\open\command             (default)           REG_SZ     <apppath> -news
-//
-///////////////////////////////////////////////////////////////////////////////
-
-
-typedef enum {
-  NO_SUBSTITUTION           = 0x00,
-  APP_PATH_SUBSTITUTION     = 0x01
-} SettingFlags;
-
-#define APP_REG_NAME L"Borealis"
-// APP_REG_NAME_MAIL and APP_REG_NAME_NEWS should be kept in synch with
-// AppRegNameMail and AppRegNameNews in the installer file: defines.nsi.in
-#define APP_REG_NAME_MAIL L"Borealis (Mail)"
-#define APP_REG_NAME_NEWS L"Borealis (News)"
-#define CLS_HTML "BorealisHTML"
-#define CLS_URL "BorealisURL"
-#define CLS_EML "BorealisEML"
-#define CLS_MAILTOURL "BorealisCOMPOSE"
-#define CLS_NEWSURL "BorealisNEWS"
-#define CLS_FEEDURL "BorealisFEED"
-#define SMI "SOFTWARE\\Clients\\StartMenuInternet\\"
-#define DI "\\DefaultIcon"
-#define II "\\InstallInfo"
-#define SOP "\\shell\\open\\command"
-
-#define VAL_ICON "%APPPATH%,0"
-#define VAL_HTML_OPEN "\"%APPPATH%\" -url \"%1\""
-#define VAL_URL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
-#define VAL_MAIL_OPEN "\"%APPPATH%\" \"%1\""
-
-#define MAKE_KEY_NAME1(PREFIX, MID) \
-  PREFIX MID
-
-// The DefaultIcon registry key value should never be used (e.g. NON_ESSENTIAL)
-// when checking if SeaMonkey is the default browser since other applications
-// (e.g. MS Office) may modify the DefaultIcon registry key value to add Icon
-// Handlers.
-// see http://msdn2.microsoft.com/en-us/library/aa969357.aspx for more info.
-static SETTING gBrowserSettings[] = {
-  // File Extension Class - as of 1.8.1.2 the value for VAL_URL_OPEN is also
-  // checked for CLS_HTML since SeaMonkey should also own opening local files
-  // when set as the default browser.
-  { MAKE_KEY_NAME1(CLS_HTML, SOP), "", VAL_HTML_OPEN, APP_PATH_SUBSTITUTION },
-
-  // Protocol Handler Class - for Vista and above
-  { MAKE_KEY_NAME1(CLS_URL, SOP), "", VAL_URL_OPEN, APP_PATH_SUBSTITUTION },
-
-  // Protocol Handlers
-  { MAKE_KEY_NAME1("HTTP", DI),    "", VAL_ICON, APP_PATH_SUBSTITUTION },
-  { MAKE_KEY_NAME1("HTTP", SOP),   "", VAL_URL_OPEN, APP_PATH_SUBSTITUTION },
-  { MAKE_KEY_NAME1("HTTPS", DI),   "", VAL_ICON, APP_PATH_SUBSTITUTION },
-  { MAKE_KEY_NAME1("HTTPS", SOP),  "", VAL_URL_OPEN, APP_PATH_SUBSTITUTION }
-
-  // These values must be set by hand, since they contain localized strings.
-  //   seamonkey.exe\shell\properties   (default)   REG_SZ  SeaMonkey &Preferences
-  //   seamonkey.exe\shell\safemode     (default)   REG_SZ  SeaMonkey &Safe Mode
-};
-
- static SETTING gMailSettings[] = {
-   // File Extension Aliases
-   { ".eml", "", CLS_EML, NO_SUBSTITUTION },
-   // File Extension Class
-   { MAKE_KEY_NAME1(CLS_EML, SOP), "",  VAL_MAIL_OPEN, APP_PATH_SUBSTITUTION},
-
-   // Protocol Handler Class - for Vista and above
-   { MAKE_KEY_NAME1(CLS_MAILTOURL, SOP), "", "\"%APPPATH%\" -osint -compose \"%1\"", APP_PATH_SUBSTITUTION },
-
-   // Protocol Handlers
-   { MAKE_KEY_NAME1("mailto", SOP), "", "\"%APPPATH%\" -osint -compose \"%1\"", APP_PATH_SUBSTITUTION }
- };
-
- static SETTING gNewsSettings[] = {
-    // Protocol Handler Class - for Vista and above
-   { MAKE_KEY_NAME1(CLS_NEWSURL, SOP), "", "\"%APPPATH%\" -osint -mail \"%1\"",  APP_PATH_SUBSTITUTION },
-
-   // Protocol Handlers
-   { MAKE_KEY_NAME1("news", SOP), "", "\"%APPPATH%\" -osint -mail \"%1\"", APP_PATH_SUBSTITUTION },
-   { MAKE_KEY_NAME1("nntp", SOP), "", "\"%APPPATH%\" -osint -mail \"%1\"", APP_PATH_SUBSTITUTION },
-};
-
- static SETTING gFeedSettings[] = {
-   // Protocol Handler Class - for Vista and above
-   { MAKE_KEY_NAME1(CLS_FEEDURL, SOP), "", "\"%APPPATH%\" -osint -mail \"%1\"", APP_PATH_SUBSTITUTION },
-
-   // Protocol Handlers
-   { MAKE_KEY_NAME1("feed", SOP), "", "\"%APPPATH%\" -osint -mail \"%1\"", APP_PATH_SUBSTITUTION },
-};
-
-nsresult
-GetHelperPath(nsString& aPath)
-{
-  nsresult rv;
-  nsCOMPtr<nsIProperties> directoryService =
-    do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIFile> appHelper;
-  rv = directoryService->Get(XRE_EXECUTABLE_FILE,
-                             NS_GET_IID(nsIFile),
-                             getter_AddRefs(appHelper));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = appHelper->SetNativeLeafName(NS_LITERAL_CSTRING("uninstall"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = appHelper->AppendNative(NS_LITERAL_CSTRING("helper.exe"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = appHelper->GetPath(aPath);
-
-  aPath.Insert('"', 0);
-  aPath.Append('"');
-
-  return rv;
-}
-
-nsresult
-LaunchHelper(const nsString& aPath)
-{
-  STARTUPINFOW si = {sizeof(si), 0};
-  PROCESS_INFORMATION pi = {0};
-
-  BOOL ok = CreateProcessW(nullptr, (LPWSTR)aPath.get(), nullptr, nullptr,
-                           FALSE, 0, nullptr, nullptr, &si, &pi);
-
-  if (!ok)
-    return NS_ERROR_FAILURE;
-
-  CloseHandle(pi.hProcess);
-  CloseHandle(pi.hThread);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::ShortcutMaintenance()
-{
-  nsresult rv;
-
-  // Launch helper.exe so it can update the application user model ids on
-  // shortcuts in the user's taskbar and start menu. This keeps older pinned
-  // shortcuts grouped correctly after major updates. Note, we also do this
-  // through the upgrade installer script, however, this is the only place we
-  // have a chance to trap links created by users who do control the install/
-  // update process of the browser.
-
-  nsCOMPtr<nsIWinTaskbar> taskbarInfo =
-    do_GetService(NS_TASKBAR_CONTRACTID);
-  if (!taskbarInfo) // If we haven't built with win7 sdk features, this fails.
-    return NS_OK;
-
-  // Avoid if this isn't Win7+
-  bool isSupported = false;
-  taskbarInfo->GetAvailable(&isSupported);
-  if (!isSupported)
-    return NS_OK;
-
-  nsAutoString appId;
-  if (NS_FAILED(taskbarInfo->GetDefaultGroupId(appId)))
-    return NS_ERROR_UNEXPECTED;
-
-  NS_NAMED_LITERAL_CSTRING(prefName, "browser.taskbar.lastgroupid");
-  nsCOMPtr<nsIPrefService> prefs =
-    do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (!prefs)
-    return NS_ERROR_UNEXPECTED;
-
-  nsCOMPtr<nsIPrefBranch> prefBranch;
-  prefs->GetBranch(nullptr, getter_AddRefs(prefBranch));
-  if (!prefBranch)
-    return NS_ERROR_UNEXPECTED;
-
-  nsCOMPtr<nsISupportsString> prefString;
-  rv = prefBranch->GetComplexValue(prefName.get(),
-                                   NS_GET_IID(nsISupportsString),
-                                   getter_AddRefs(prefString));
-  if (NS_SUCCEEDED(rv)) {
-    nsAutoString version;
-    prefString->GetData(version);
-    if (version.Equals(appId)) {
-      // We're all good, get out of here.
-      return NS_OK;
-    }
-  }
-  // Update the version in prefs
-  prefString = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  prefString->SetData(appId);
-  rv = prefBranch->SetComplexValue(prefName.get(),
-                                   NS_GET_IID(nsISupportsString),
-                                   prefString);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Couldn't set last user model id!");
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  nsAutoString appHelperPath;
-  if (NS_FAILED(GetHelperPath(appHelperPath)))
-    return NS_ERROR_UNEXPECTED;
-
-  appHelperPath.AppendLiteral(" /UpdateShortcutAppUserModelIds");
-
-  return LaunchHelper(appHelperPath);
-}
-
-/* helper routine. Iterate over the passed in settings object,
-   testing each key to see if we are handling it.
-*/
-bool
-nsWindowsShellService::TestForDefault(SETTING aSettings[], int32_t aSize)
-{
-  wchar_t currValue[MAX_BUF];
-  SETTING* end = aSettings + aSize;
-  for (SETTING * settings = aSettings; settings < end; ++settings) {
-    NS_ConvertUTF8toUTF16 dataLongPath(settings->valueData);
-    NS_ConvertUTF8toUTF16 dataShortPath(settings->valueData);
-    NS_ConvertUTF8toUTF16 key(settings->keyName);
-    NS_ConvertUTF8toUTF16 value(settings->valueName);
-    if (settings->flags & APP_PATH_SUBSTITUTION) {
-      int32_t offset = dataLongPath.Find("%APPPATH%");
-      dataLongPath.Replace(offset, 9, mAppLongPath);
-      // Remove the quotes around %APPPATH% in VAL_OPEN for short paths
-      int32_t offsetQuoted = dataShortPath.Find("\"%APPPATH%\"");
-      if (offsetQuoted != -1)
-        dataShortPath.Replace(offsetQuoted, 11, mAppShortPath);
-      else
-        dataShortPath.Replace(offset, 9, mAppShortPath);
-    }
-
-    ::ZeroMemory(currValue, sizeof(currValue));
-    HKEY theKey;
-    nsresult rv = OpenKeyForReading(HKEY_CLASSES_ROOT, key.get(), &theKey);
-    if (NS_FAILED(rv))
-      // Key does not exist
-      return false;
-
-    DWORD len = sizeof currValue;
-    DWORD res = ::RegQueryValueExW(theKey, value.get(),
-                                   nullptr, nullptr, (LPBYTE)currValue, &len);
-    // Close the key we opened.
-    ::RegCloseKey(theKey);
-    if (REG_FAILED(res) ||
-        _wcsicmp(dataLongPath.get(), currValue) &&
-        _wcsicmp(dataShortPath.get(), currValue)) {
-      // Key wasn't set, or was set to something else (something else became the default client)
-      return false;
-    }
-  }
-
-  return true;
-}
-
-nsresult nsWindowsShellService::Init()
-{
-  wchar_t appPath[MAX_BUF];
-  if (!::GetModuleFileNameW(0, appPath, MAX_BUF))
-    return NS_ERROR_FAILURE;
-
-  mAppLongPath.Assign(appPath);
-
-  // Support short path to the exe so if it is already set the user is not
-  // prompted to set the default mail client again.
-  if (!::GetShortPathNameW(appPath, appPath, MAX_BUF))
-    return NS_ERROR_FAILURE;
-
-  mAppShortPath.Assign(appPath);
-
-  return NS_OK;
-}
-
-bool
-nsWindowsShellService::IsDefaultClientVista(uint16_t aApps, bool* aIsDefaultClient)
-{
-  IApplicationAssociationRegistration* pAAR;
-
-  HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
-                                nullptr,
-                                CLSCTX_INPROC,
-                                IID_IApplicationAssociationRegistration,
-                                (void**)&pAAR);
-
-  if (SUCCEEDED(hr)) {
-    BOOL isDefaultBrowser = true;
-    BOOL isDefaultMail    = true;
-    BOOL isDefaultNews    = true;
-    if (aApps & nsIShellService::BROWSER)
-      pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME, &isDefaultBrowser);
-    if (aApps & nsIShellService::MAIL)
-      pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME_MAIL, &isDefaultMail);
-    if (aApps & nsIShellService::NEWS)
-      pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME_NEWS, &isDefaultNews);
-
-    *aIsDefaultClient = isDefaultBrowser && isDefaultNews && isDefaultMail;
-
-    pAAR->Release();
-    return true;
-  }
-  return false;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::IsDefaultClient(bool aStartupCheck, uint16_t aApps, bool *aIsDefaultClient)
-{
-  // If this is the first application window, maintain internal state that we've
-  // checked this session (so that subsequent window opens don't show the
-  // default client dialog).
-  if (aStartupCheck)
-    mCheckedThisSessionClient = true;
-
-  *aIsDefaultClient = true;
-
-  // for each type, check if it is the default app
-  // browser check needs to be at the top
-  if (aApps & nsIShellService::BROWSER) {
-    *aIsDefaultClient &= TestForDefault(gBrowserSettings, sizeof(gBrowserSettings)/sizeof(SETTING));
-    // Only check if this app is default on Vista if the previous checks
-    // indicate that this app is the default.
-    if (*aIsDefaultClient)
-      IsDefaultClientVista(nsIShellService::BROWSER, aIsDefaultClient);
-  }
-  if (aApps & nsIShellService::MAIL) {
-    *aIsDefaultClient &= TestForDefault(gMailSettings, sizeof(gMailSettings)/sizeof(SETTING));
-    // Only check if this app is default on Vista if the previous checks
-    // indicate that this app is the default.
-    if (*aIsDefaultClient)
-      IsDefaultClientVista(nsIShellService::MAIL, aIsDefaultClient);
-  }
-  if (aApps & nsIShellService::NEWS) {
-    *aIsDefaultClient &= TestForDefault(gNewsSettings, sizeof(gNewsSettings)/sizeof(SETTING));
-    // Only check if this app is default on Vista if the previous checks
-    // indicate that this app is the default.
-    if (*aIsDefaultClient)
-      IsDefaultClientVista(nsIShellService::NEWS, aIsDefaultClient);
-  }
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsWindowsShellService::SetDefaultClient(bool aForAllUsers,
-                                        bool aClaimAllTypes, uint16_t aApps)
-{
-  nsAutoString appHelperPath;
-  if (NS_FAILED(GetHelperPath(appHelperPath)))
-    return NS_ERROR_UNEXPECTED;
-
-  if (aForAllUsers)
-    appHelperPath.AppendLiteral(" /SetAsDefaultAppGlobal");
-  else {
-    appHelperPath.AppendLiteral(" /SetAsDefaultAppUser");
-    if (aApps & nsIShellService::BROWSER)
-      appHelperPath.AppendLiteral(" Browser");
-
-    if (aApps & nsIShellService::MAIL)
-      appHelperPath.AppendLiteral(" Mail");
-
-    if (aApps & nsIShellService::NEWS)
-      appHelperPath.AppendLiteral(" News");
-   }
-
-  STARTUPINFOW si = {sizeof(si), 0};
-  PROCESS_INFORMATION pi = {0};
-
-  BOOL ok = CreateProcessW(nullptr, (LPWSTR)appHelperPath.get(), nullptr,
-                           nullptr, FALSE, 0, nullptr, nullptr, &si, &pi);
-
-  if (!ok)
-    return NS_ERROR_FAILURE;
-
-  CloseHandle(pi.hProcess);
-  CloseHandle(pi.hThread);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::GetShouldCheckDefaultClient(bool* aResult)
-{
-  if (mCheckedThisSessionClient) {
-    *aResult = false;
-    return NS_OK;
-  }
-
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->GetBoolPref(PREF_CHECKDEFAULTCLIENT, aResult);
-}
-
-
-
-NS_IMETHODIMP
-nsWindowsShellService::SetShouldCheckDefaultClient(bool aShouldCheck)
-{
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
-  NS_ENSURE_TRUE(prefs, NS_ERROR_FAILURE);
-  return prefs->SetBoolPref(PREF_CHECKDEFAULTCLIENT, aShouldCheck);
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::GetShouldBeDefaultClientFor(uint16_t* aApps)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  int32_t result;
-  rv = prefs->GetIntPref("shell.checkDefaultApps", &result);
-  *aApps = result;
-  return rv;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::SetShouldBeDefaultClientFor(uint16_t aApps)
-{
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return prefs->SetIntPref("shell.checkDefaultApps", aApps);
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::GetCanSetDesktopBackground(bool* aResult)
-{
-  *aResult = true;
-  return NS_OK;
-}
-
-static nsresult
-WriteBitmap(nsIFile* aFile, imgIContainer* aImage)
-{
-  nsresult rv;
-
-  RefPtr<SourceSurface> surface =
-    aImage->GetFrame(imgIContainer::FRAME_CURRENT,
-                     imgIContainer::FLAG_SYNC_DECODE);
-  NS_ENSURE_TRUE(surface, NS_ERROR_FAILURE);
-
-  // For either of the following formats we want to set the biBitCount member
-  // of the BITMAPINFOHEADER struct to 32, below. For that value the bitmap
-  // format defines that the A8/X8 WORDs in the bitmap byte stream be ignored
-  // for the BI_RGB value we use for the biCompression member.
-  MOZ_ASSERT(surface->GetFormat() == SurfaceFormat::B8G8R8A8 ||
-             surface->GetFormat() == SurfaceFormat::B8G8R8X8);
-
-  RefPtr<DataSourceSurface> dataSurface = surface->GetDataSurface();
-  NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE);
-
-  int32_t width = dataSurface->GetSize().width;
-  int32_t height = dataSurface->GetSize().height;
-  int32_t bytesPerPixel = 4 * sizeof(uint8_t);
-  int32_t bytesPerRow = bytesPerPixel * width;
-
-  // initialize these bitmap structs which we will later
-  // serialize directly to the head of the bitmap file
-  BITMAPINFOHEADER bmi;
-  bmi.biSize = sizeof(BITMAPINFOHEADER);
-  bmi.biWidth = width;
-  bmi.biHeight = height;
-  bmi.biPlanes = 1;
-  bmi.biBitCount = (WORD)bytesPerPixel*8;
-  bmi.biCompression = BI_RGB;
-  bmi.biSizeImage = bytesPerRow * height;
-  bmi.biXPelsPerMeter = 0;
-  bmi.biYPelsPerMeter = 0;
-  bmi.biClrUsed = 0;
-  bmi.biClrImportant = 0;
-
-  BITMAPFILEHEADER bf;
-  bf.bfType = 0x4D42; // 'BM'
-  bf.bfReserved1 = 0;
-  bf.bfReserved2 = 0;
-  bf.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
-  bf.bfSize = bf.bfOffBits + bmi.biSizeImage;
-
-  // get a file output stream
-  nsCOMPtr<nsIOutputStream> stream;
-  rv = NS_NewLocalFileOutputStream(getter_AddRefs(stream), aFile);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  DataSourceSurface::MappedSurface map;
-  if (!dataSurface->Map(DataSourceSurface::MapType::READ, &map)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // write the bitmap headers and rgb pixel data to the file
-  rv = NS_ERROR_FAILURE;
-  if (stream) {
-    uint32_t written;
-    stream->Write((const char*)&bf, sizeof(BITMAPFILEHEADER), &written);
-    if (written == sizeof(BITMAPFILEHEADER)) {
-      stream->Write((const char*)&bmi, sizeof(BITMAPINFOHEADER), &written);
-      if (written == sizeof(BITMAPINFOHEADER)) {
-        // write out the image data backwards because the desktop won't
-        // show bitmaps with negative heights for top-to-bottom
-        uint32_t i = map.mStride * height;
-        rv = NS_OK;
-        do {
-          i -= map.mStride;
-          stream->Write(((const char*)map.mData) + i, bytesPerRow, &written);
-          if (written != bytesPerRow) {
-            rv = NS_ERROR_FAILURE;
-            break;
-          }
-        } while (i != 0);
-      }
-    }
-
-    stream->Close();
-  }
-
-  dataSurface->Unmap();
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
-                                            int32_t aPosition)
-{
-  nsresult rv;
-
-  nsCOMPtr<imgIContainer> container;
-
-  nsCOMPtr<nsIDOMHTMLImageElement> imgElement(do_QueryInterface(aElement));
-  if (!imgElement) {
-    // XXX write background loading stuff!
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-  else {
-    nsCOMPtr<nsIImageLoadingContent> imageContent =
-      do_QueryInterface(aElement, &rv);
-    if (!imageContent)
-      return rv;
-
-    // get the image container
-    nsCOMPtr<imgIRequest> request;
-    rv = imageContent->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
-                                  getter_AddRefs(request));
-    if (!request)
-      return rv;
-    rv = request->GetImage(getter_AddRefs(container));
-  }
-
-  if (!container)
-    return NS_ERROR_FAILURE;
-
-  // get the file name from localized strings
-  nsCOMPtr<nsIStringBundleService> bundleService =
-    mozilla::services::GetStringBundleService();
-  NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
-
-  nsCOMPtr<nsIStringBundle> shellBundle;
-  rv = bundleService->CreateBundle(SHELLSERVICE_PROPERTIES,
-                                   getter_AddRefs(shellBundle));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // e.g. "Desktop Background.bmp"
-  nsString fileLeafName;
-  rv = shellBundle->GetStringFromName
-                      (u"desktopBackgroundLeafNameWin",
-                       getter_Copies(fileLeafName));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // get the profile root directory
-  nsCOMPtr<nsIFile> file;
-  rv = NS_GetSpecialDirectory(NS_APP_APPLICATION_REGISTRY_DIR,
-                              getter_AddRefs(file));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // eventually, the path is "%APPDATA%\Mozilla\SeaMonkey\Desktop Background.bmp"
-  rv = file->Append(fileLeafName);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoString path;
-  rv = file->GetPath(path);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // write the bitmap to a file in the profile directory
-  rv = WriteBitmap(file, container);
-
-  // if the file was written successfully, set it as the system wallpaper
-  if (NS_SUCCEEDED(rv)) {
-    nsCOMPtr<nsIWindowsRegKey> key(do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = key->Create(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
-                     NS_LITERAL_STRING("Control Panel\\Desktop"),
-                     nsIWindowsRegKey::ACCESS_SET_VALUE);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    int style = 0;
-    switch (aPosition) {
-      case BACKGROUND_STRETCH:
-        style = 2;
-        break;
-      case BACKGROUND_FILL:
-        style = 10;
-        break;
-      case BACKGROUND_FIT:
-        style = 6;
-        break;
-    }
-
-    nsString value;
-    value.AppendInt(style);
-    rv = key->WriteStringValue(NS_LITERAL_STRING("WallpaperStyle"), value);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    value.Assign(aPosition == BACKGROUND_TILE ? '1' : '0');
-    rv = key->WriteStringValue(NS_LITERAL_STRING("TileWallpaper"), value);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = key->Close();
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    ::SystemParametersInfoW(SPI_SETDESKWALLPAPER, 0, (PVOID)path.get(),
-                            SPIF_UPDATEINIFILE | SPIF_SENDWININICHANGE);
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::GetDesktopBackgroundColor(uint32_t* aColor)
-{
-  uint32_t color = ::GetSysColor(COLOR_DESKTOP);
-  *aColor = (GetRValue(color) << 16) | (GetGValue(color) << 8) | GetBValue(color);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::SetDesktopBackgroundColor(uint32_t aColor)
-{
-  int parameter = COLOR_DESKTOP;
-  BYTE r = (aColor >> 16);
-  BYTE g = (aColor << 16) >> 24;
-  BYTE b = (aColor << 24) >> 24;
-  COLORREF color = RGB(r,g,b);
-
-  ::SetSysColors(1, &parameter, &color);
-
-  nsresult rv;
-  nsCOMPtr<nsIWindowsRegKey> key(do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = key->Create(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
-                   NS_LITERAL_STRING("Control Panel\\Colors"),
-                   nsIWindowsRegKey::ACCESS_SET_VALUE);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  wchar_t rgb[12];
-  _snwprintf(rgb, 12, L"%u %u %u", r, g, b);
-  rv = key->WriteStringValue(NS_LITERAL_STRING("Background"),
-                             nsDependentString(rgb));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return key->Close();
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::OpenApplicationWithURI(nsIFile* aApplication,
-                                              const nsACString& aURI)
-{
-  nsresult rv;
-  nsCOMPtr<nsIProcess> process =
-    do_CreateInstance("@mozilla.org/process/util;1", &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = process->Init(aApplication);
-  if (NS_FAILED(rv))
-    return rv;
-
-  const nsCString& spec = PromiseFlatCString(aURI);
-  const char* specStr = spec.get();
-  return process->Run(false, &specStr, 1);
-}
-
-NS_IMETHODIMP
-nsWindowsShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
-  *_retval = nullptr;
-
-  nsresult rv;
-  nsCOMPtr<nsIWindowsRegKey> key(do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = key->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT,
-                 NS_LITERAL_STRING("feed\\shell\\open\\command"),
-                 nsIWindowsRegKey::ACCESS_READ);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsString path;
-  rv = key->ReadStringValue(EmptyString(), path);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (path.IsEmpty())
-    return NS_ERROR_FAILURE;
-
-  if (path.First() == '"') {
-    // Everything inside the quotes
-    path = Substring(path, 1, path.FindChar('"', 1) - 1);
-  } else {
-    // Everything up to the first space
-    path = Substring(path, 0, path.FindChar(' '));
-  }
-
-  nsCOMPtr<nsIFile> defaultReader =
-    do_CreateInstance("@mozilla.org/file/local;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = defaultReader->InitWithPath(path);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  bool exists;
-  rv = defaultReader->Exists(&exists);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!exists)
-    return NS_ERROR_FAILURE;
-
-  NS_ADDREF(*_retval = defaultReader);
-  return NS_OK;
-}
diff --git a/navigator/components/shell/src/nsWindowsShellService.h b/navigator/components/shell/src/nsWindowsShellService.h
deleted file mode 100644
index 8d339eb5..00000000
--- a/navigator/components/shell/src/nsWindowsShellService.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nscore.h"
-#include "nsShellService.h"
-#include "nsStringGlue.h"
-#include "nsIWindowsShellService.h"
-#include "mozilla/Attributes.h"
-
-#include <windows.h>
-
-#define NS_SUITEWININTEGRATION_CID \
-{0x39b688ec, 0xe308, 0x49e5, {0xbe, 0x6b, 0x28, 0xdc, 0x7f, 0xcd, 0x61, 0x54}}
-
-typedef struct {
-  const char* keyName;
-  const char* valueName;
-  const char* valueData;
-
-  int32_t flags;
-} SETTING;
-
-class nsWindowsShellService final : public nsIWindowsShellService
-{
-public:
-  nsWindowsShellService() : mCheckedThisSessionClient(false) {};
-  nsresult Init();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHELLSERVICE
-  NS_DECL_NSIWINDOWSSHELLSERVICE
-
-protected:
-  ~nsWindowsShellService() {}
-  bool IsDefaultClientVista(uint16_t aApps, bool* aIsDefaultClient);
-  bool TestForDefault(SETTING aSettings[], int32_t aSize);
-
-private:
-  bool mCheckedThisSessionClient;
-  nsString mAppLongPath;
-  nsString mAppShortPath;
-};
-
diff --git a/navigator/installer/package-manifest.in b/navigator/installer/package-manifest.in
index e635089e..eb6ad684 100644
--- a/navigator/installer/package-manifest.in
+++ b/navigator/installer/package-manifest.in
@@ -55,9 +55,11 @@
 @RESPATH@/fonts/*
 #endif
 @RESPATH@/searchplugins/*
+#ifdef 0
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
+#endif
 #ifdef MOZ_UPDATER
 @RESPATH@/updater.ini
 #endif
@@ -286,21 +288,6 @@
 @RESPATH@/chrome/pippki@JAREXT@
 @RESPATH@/chrome/pippki.manifest
 
-; For process sandboxing
-#if defined(MOZ_SANDBOX)
-#if defined(XP_WIN)
-#if defined(WOW_HELPER)
-@BINPATH@/wow_helper.exe
-#endif
-#endif
-#endif
-
-#if defined(MOZ_SANDBOX)
-#if defined(XP_LINUX)
-@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
-#endif
-#endif
-
 ; [Updater]
 ;
 #ifdef MOZ_UPDATER
diff --git a/navigator/installer/windows/Makefile.in b/navigator/installer/windows/Makefile.in
deleted file mode 100644
index d2d1c985..00000000
--- a/navigator/installer/windows/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk
-
-CONFIG_DIR = instgen
-
-ifdef MOZ_OFFICIAL_BRANDING
-BRANDED_SFX = 1
-else
-ifneq (,$(findstring unstable,$(MOZ_BRANDING_DIRECTORY)))
-BRANDED_SFX = 1
-endif
-endif
-
-ifdef BRANDED_SFX
-SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/binoc/7zSD.sfx
-else
-SFX_MODULE = $(MOZILLA_SRCDIR)/other-licenses/7zstub/uxp/7zSD.sfx
-endif
-
-INSTALLER_FILES = \
-	app.tag \
-	nsis/installer.nsi \
-	nsis/uninstaller.nsi \
-	nsis/shared.nsh \
-	nsis/custom.nsi \
-	$(NULL)
-
-BRANDING_FILES = \
-	branding.nsi \
-	wizHeader.bmp \
-	wizHeaderRTL.bmp \
-	wizWatermark.bmp \
-	$(NULL)
-
-ifdef MOZ_UPDATER
-DEFINES += -DMOZ_UPDATER=1
-endif
-
-include $(topsrcdir)/config/config.mk
-
-OVERRIDE_DEFAULT_GOAL := installer
-installer::
-	$(MAKE) -C .. installer-stage
-	$(MAKE) $(CONFIG_DIR)/setup.exe
-
-# For building the uninstaller during the application build so it can be
-# included for mar file generation.
-uninstaller::
-	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(MOZILLA_SRCDIR) \
-	  $(topsrcdir)/navigator/installer/windows/locale $(AB_CD) $(CONFIG_DIR)
-
-$(CONFIG_DIR)/setup.exe::
-	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
-	  --convert-utf8-utf16le $(DIST)/branding/license.txt $(CONFIG_DIR)/license.txt
-	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(MOZILLA_SRCDIR) \
-	  $(topsrcdir)/navigator/installer/windows/locale $(AB_CD) $(CONFIG_DIR)
-
-include $(topsrcdir)/config/rules.mk
-include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk
diff --git a/navigator/installer/windows/app.tag b/navigator/installer/windows/app.tag
deleted file mode 100644
index 10770889..00000000
--- a/navigator/installer/windows/app.tag
+++ /dev/null
@@ -1,4 +0,0 @@
-;!@Install@!UTF-8!
-Title="Borealis"
-RunProgram="setup.exe"
-;!@InstallEnd@!
diff --git a/navigator/installer/windows/locale/custom.properties b/navigator/installer/windows/locale/custom.properties
deleted file mode 100644
index 08ce1a2e..00000000
--- a/navigator/installer/windows/locale/custom.properties
+++ /dev/null
@@ -1,90 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
-# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
-# for double ampersand) and prevents the letter following the ampersand from
-# being used as an accesskey.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-
-REG_APP_DESC=$BrandShortName delivers safe, easy web browsing. A familiar user interface, enhanced security features including protection from online identity theft, and integrated search let you get the most out of the web.
-OPTIONAL_COMPONENTS_TITLE=Choose Optional Components
-OPTIONAL_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
-OPTIONAL_COMPONENTS_LABEL=Optional Components:
-DOMI_TITLE=DOM Inspector
-DOMI_TEXT=Inspects the structure and properties of a window and its contents.
-DEBUGQA_TITLE=Debug and QA UI
-DEBUGQA_TEXT=Provides additional debug and QA UI for $BrandShortName development.
-CHATZILLA_TITLE=ChatZilla
-CHATZILLA_TEXT=A clean, easy to use and highly extensible IRC client.
-CONTEXT_OPTIONS=$BrandShortName &Options
-CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
-SAFE_MODE=Safe Mode
-# MAILNEWS_TEXT appears in Windows (All) Programs menu as "Borealis $(MAILNEWS_TEXT)"
-MAILNEWS_TEXT=Mail
-PROFILE_TEXT=Profile Manager
-OPTIONS_PAGE_TITLE=Setup Type
-OPTIONS_PAGE_SUBTITLE=Choose setup options
-SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
-SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
-SUMMARY_PAGE_TITLE=Summary
-SUMMARY_PAGE_SUBTITLE=Ready to start installing $BrandShortName
-SUMMARY_INSTALLED_TO=$BrandShortName will be installed to the following location:
-SUMMARY_CLICK=Click Install to continue.
-SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
-SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
-SURVEY_TEXT=&Tell us what you thought of $BrandShortName
-LAUNCH_TEXT=&Launch $BrandFullNameDA now
-CREATE_ICONS_DESC=Create icons for $BrandShortName:
-ICONS_DESKTOP=On my &Desktop
-ICONS_STARTMENU=In my &Start Menu Programs folder
-ICONS_QUICKLAUNCH=In my &Quick Launch bar
-WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
-WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location.
-WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
-WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information.
-WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
-WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
-WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
-WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
-WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of $BrandShortName. Do you want to reboot now?
-WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of $BrandShortName. Do you want to reboot now?
-ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
-ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
-
-UN_CONFIRM_CLICK=Click Uninstall to continue.
-UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
-UN_CONFIRM_PAGE_SUBTITLE=Remove $BrandFullName from your computer.
-UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName will be uninstalled from the following location:
-
-STATUS_INSTALL_APP=Installing $BrandShortName…
-STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
-STATUS_INSTALL_OPTIONAL=Installing Optional Components…
-STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortName…
-STATUS_CLEANUP=A Little Housekeeping…
-
-BANNER_CHECK_EXISTING=Checking existing installation…
-
-# _DESC strings support approximately 65 characters per line.
-# One line
-OPTIONS_SUMMARY=Choose the type of setup you prefer, then click Next.
-# One line
-OPTION_STANDARD_DESC=$BrandShortName will be installed with the most common options.
-OPTION_STANDARD_RADIO=&Standard
-# One line
-OPTION_COMPLETE_DESC=$BrandShortName will be installed with all available options.
-OPTION_COMPLETE_RADIO=C&omplete
-# Two lines
-OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users.
-OPTION_CUSTOM_RADIO=&Custom
diff --git a/navigator/installer/windows/locale/mui.properties b/navigator/installer/windows/locale/mui.properties
deleted file mode 100644
index 68841d5e..00000000
--- a/navigator/installer/windows/locale/mui.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# To make the l10n tinderboxen see changes to this file you can change a value
-# name by adding - to the end of the name followed by chars (e.g. Branding-2).
-
-# LOCALIZATION NOTE:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
-# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
-# for double ampersand) and prevents the letter following the ampersand from
-# being used as an accesskey.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-MUI_TEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Setup Wizard
-MUI_TEXT_WELCOME_INFO_TEXT=This wizard will guide you through the installation of $BrandFullNameDA.\n\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\n\n$_CLICK
-MUI_TEXT_LICENSE_TITLE=License Agreement
-MUI_TEXT_LICENSE_SUBTITLE=Please review the license terms before installing $BrandFullNameDA.
-MUI_INNERTEXT_LICENSE_TOP=Press Page Down to see the rest of the agreement.
-MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX=If you accept the terms of the agreement, click the check box below. You must accept the agreement to install $BrandFullNameDA. $_CLICK
-MUI_TEXT_COMPONENTS_TITLE=Choose Components
-MUI_TEXT_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
-MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE=Description
-MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO=Position your mouse over a component to see its description.
-MUI_TEXT_DIRECTORY_TITLE=Choose Install Location
-MUI_TEXT_DIRECTORY_SUBTITLE=Choose the folder in which to install $BrandFullNameDA.
-MUI_TEXT_INSTALLING_TITLE=Installing
-MUI_TEXT_INSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being installed.
-MUI_TEXT_FINISH_TITLE=Installation Complete
-MUI_TEXT_FINISH_SUBTITLE=Setup was completed successfully.
-MUI_TEXT_ABORT_TITLE=Installation Aborted
-MUI_TEXT_ABORT_SUBTITLE=Setup was not completed successfully.
-MUI_BUTTONTEXT_FINISH=&Finish
-MUI_TEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Setup Wizard
-MUI_TEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been installed on your computer.\n\nClick Finish to close this wizard.
-MUI_TEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the installation of $BrandFullNameDA. Do you want to reboot now?
-MUI_TEXT_FINISH_REBOOTNOW=Reboot now
-MUI_TEXT_FINISH_REBOOTLATER=I want to manually reboot later
-MUI_TEXT_STARTMENU_TITLE=Choose Start Menu Folder
-MUI_TEXT_STARTMENU_SUBTITLE=Choose a Start Menu folder for the $BrandFullNameDA shortcuts.
-MUI_INNERTEXT_STARTMENU_TOP=Select the Start Menu folder in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.
-MUI_TEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Setup?
-MUI_UNTEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Uninstall Wizard
-MUI_UNTEXT_WELCOME_INFO_TEXT=This wizard will guide you through the uninstallation of $BrandFullNameDA.\n\nBefore starting the uninstallation, make sure $BrandFullNameDA is not running.\n\n$_CLICK
-MUI_UNTEXT_CONFIRM_TITLE=Uninstall $BrandFullNameDA
-MUI_UNTEXT_CONFIRM_SUBTITLE=Remove $BrandFullNameDA from your computer.
-MUI_UNTEXT_UNINSTALLING_TITLE=Uninstalling
-MUI_UNTEXT_UNINSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being uninstalled.
-MUI_UNTEXT_FINISH_TITLE=Uninstallation Complete
-MUI_UNTEXT_FINISH_SUBTITLE=Uninstall was completed successfully.
-MUI_UNTEXT_ABORT_TITLE=Uninstallation Aborted
-MUI_UNTEXT_ABORT_SUBTITLE=Uninstall was not completed successfully.
-MUI_UNTEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Uninstall Wizard
-MUI_UNTEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been uninstalled from your computer.\n\nClick Finish to close this wizard.
-MUI_UNTEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the uninstallation of $BrandFullNameDA. Do you want to reboot now?
-MUI_UNTEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Uninstall?
diff --git a/navigator/installer/windows/locale/override.properties b/navigator/installer/windows/locale/override.properties
deleted file mode 100644
index 288f6748..00000000
--- a/navigator/installer/windows/locale/override.properties
+++ /dev/null
@@ -1,86 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
-# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
-# for double ampersand) and prevents the letter following the ampersand from
-# being used as an accesskey.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-
-# Strings that require a space at the end should be enclosed with double
-# quotes and the double quotes will be removed. To add quotes to the beginning
-# and end of a strong enclose the add and additional double quote to the
-# beginning and end of the string (e.g. ""This will include quotes"").
-
-SetupCaption=$BrandFullName Setup
-UninstallCaption=$BrandFullName Uninstall
-BackBtn=< &Back
-NextBtn=&Next >
-AcceptBtn=I &accept the terms in the License Agreement
-DontAcceptBtn=I &do not accept the terms in the License Agreement
-InstallBtn=&Install
-UninstallBtn=&Uninstall
-CancelBtn=Cancel
-CloseBtn=&Close
-BrowseBtn=B&rowse…
-ShowDetailsBtn=Show &details
-ClickNext=Click Next to continue.
-ClickInstall=Click Install to start the installation.
-ClickUninstall=Click Uninstall to start the uninstallation.
-Completed=Completed
-LicenseTextRB=Please review the license agreement before installing $BrandFullNameDA. If you accept all terms of the agreement, select the first option below. $_CLICK
-ComponentsText=Check the components you want to install and uncheck the components you don't want to install. $_CLICK
-ComponentsSubText2_NoInstTypes=Select components to install:
-DirText=Setup will install $BrandFullNameDA in the following folder. To install in a different folder, click Browse and select another folder. $_CLICK
-DirSubText=Destination Folder
-DirBrowseText=Select the folder to install $BrandFullNameDA in:
-SpaceAvailable="Space available: "
-SpaceRequired="Space required: "
-UninstallingText=$BrandFullNameDA will be uninstalled from the following folder. $_CLICK
-UninstallingSubText=Uninstalling from:
-FileError=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Abort to stop the installation,\r\nRetry to try again, or\r\nIgnore to skip this file.
-FileError_NoIgnore=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Retry to try again, or\r\nCancel to stop the installation.
-CantWrite="Can't write: "
-CopyFailed=Copy failed
-CopyTo="Copy to "
-Registering="Registering: "
-Unregistering="Unregistering: "
-SymbolNotFound="Could not find symbol: "
-CouldNotLoad="Could not load: "
-CreateFolder="Create folder: "
-CreateShortcut="Create shortcut: "
-CreatedUninstaller="Created uninstaller: "
-Delete="Delete file: "
-DeleteOnReboot="Delete on reboot: "
-ErrorCreatingShortcut="Error creating shortcut: "
-ErrorCreating="Error creating: "
-ErrorDecompressing=Error decompressing data! Corrupted installer?
-ErrorRegistering=Error registering DLL
-ExecShell="ExecShell: "
-Exec="Execute: "
-Extract="Extract: "
-ErrorWriting="Extract: error writing to file "
-InvalidOpcode=Installer corrupted: invalid opcode
-NoOLE="No OLE for: "
-OutputFolder="Output folder: "
-RemoveFolder="Remove folder: "
-RenameOnReboot="Rename on reboot: "
-Rename="Rename: "
-Skipped="Skipped: "
-CopyDetails=Copy Details To Clipboard
-LogInstall=Log install process
-Byte=B
-Kilo=K
-Mega=M
-Giga=G
diff --git a/navigator/installer/windows/moz.build b/navigator/installer/windows/moz.build
deleted file mode 100644
index 967d6b7b..00000000
--- a/navigator/installer/windows/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-
-DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
-DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
-DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']
-
-if CONFIG['MOZ_OFFICIAL_BRANDING']:
-  DEFINES['MOZ_OFFICIAL_BRANDING'] = 1
diff --git a/navigator/installer/windows/nsis/custom.nsi b/navigator/installer/windows/nsis/custom.nsi
deleted file mode 100644
index a4c5557e..00000000
--- a/navigator/installer/windows/nsis/custom.nsi
+++ /dev/null
@@ -1,137 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-!macro checkSuiteComponents
-  ; If no extensions are available skip the components page
-  ${Unless} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-  ${AndUnless} ${FileExists} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi"
-  ${AndUnless} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
-  ${AndUnless} ${FileExists} "$EXEDIR\optional\distribution\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
-    Abort
-  ${EndUnless}
-!macroend
-
-!macro createSuiteComponentsIni
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Text   "$(OPTIONAL_COMPONENTS_LABEL)"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Top    "0"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Bottom "15"
-
-  StrCpy $R1 2
-  ; Top of checkbox
-  StrCpy $R2 15
-  ; Bottom of checkbox
-  StrCpy $R3 25
-  ; Seperation between titles/text
-  StrCpy $R4 25
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "checkbox"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(CHATZILLA_TITLE)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "15"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
-    ${GetSize} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi" "/S=0K" $0 $8 $9
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi"
-      ${GetSize} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi" "/S=0K" $1 $8 $9
-      IntOp $0 $0 + $1
-    ${EndIf}
-    SectionSetSize ${CZ_IDX} $0
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${Else}
-    ; Hide ChatZilla in the components page if it isn't available.
-    SectionSetText ${CZ_IDX} ""
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi"
-    ; Set the details for DOMI
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "checkbox"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(DOMI_TITLE)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "15"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
-    ${GetSize} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi" "/S=0K" $0 $8 $9
-    SectionSetSize ${DOMI_IDX} $0
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${Else}
-    ; Hide DOMi in the components page if it isn't available.
-    SectionSetText ${DOMI_IDX} ""
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "checkbox"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(DEBUGQA_TITLE)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "15"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
-    ${GetSize} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi" "/S=0K" $0 $8 $9
-    SectionSetSize ${DEBUG_IDX} $0
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${Else}
-    ; Hide debugQA in the components page if it isn't available.
-    SectionSetText ${DEBUG_IDX} ""
-  ${EndIf}
-
-  ; Set new values for the top and bottom of labels
-  ; Top of label box
-  StrCpy $R2 27
-  ; Bottom of label box
-  StrCpy $R3 47
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "label"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(CHATZILLA_TEXT)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "30"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "label"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(DOMI_TEXT)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "30"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "label"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(DEBUGQA_TEXT)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "30"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
-    IntOp $R1 $R1 + 1
-    IntOp $R2 $R2 + $R4
-    IntOp $R3 $R3 + $R4
-  ${EndIf}
-
-  WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "$R1"
-
-!macroend
diff --git a/navigator/installer/windows/nsis/defines.nsi.in b/navigator/installer/windows/nsis/defines.nsi.in
deleted file mode 100644
index 4a1eaf74..00000000
--- a/navigator/installer/windows/nsis/defines.nsi.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#filter substitution
-!define AppName               "@MOZ_APP_DISPLAYNAME@"
-!define AppVersion            "@APP_VERSION@"
-!define GREVersion            @MOZILLA_VERSION@
-!define AB_CD                 "@AB_CD@"
-!define NO_UNINSTALL_SURVEY
-
-!define FileMainEXE           "@MOZ_APP_NAME@.exe"
-!define WindowClass           "BorealisMessageWindow"
-!define DDEApplication        "Borealis"
-
-!define AppRegName            "Borealis"
-!define AppRegNameMail        "Borealis (Mail)"
-!define AppRegNameNews        "Borealis (News)"
-
-!define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
-!define BrandFullName         "${BrandFullNameInternal}"
-
-# ARCH is used when it is necessary to differentiate the x64 registry keys from
-# the x86 registry keys (e.g. the uninstall registry key).
-#ifdef HAVE_64BIT_BUILD
-!define HAVE_64BIT_BUILD
-!define ARCH "x64"
-!define MinSupportedVer "Microsoft Windows 7 x64"
-#else
-!define ARCH "x86"
-!define MinSupportedVer "Microsoft Windows 7"
-#endif
-
-!define MinSupportedCPU "SSE2"
-
-# File details shared by both the installer and uninstaller
-VIProductVersion "1.0.0.0"
-VIAddVersionKey "ProductName"     "${BrandShortName}"
-VIAddVersionKey "CompanyName"     "${CompanyName}"
-#ifdef MOZ_OFFICIAL_BRANDING
-VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Binary Outcast."
-#else
-VIAddVersionKey "LegalTrademarks" "All marks are trademark of their respective owners."
-#endif
-VIAddVersionKey "LegalCopyright"  "${CompanyName}"
-VIAddVersionKey "FileVersion"     "${AppVersion}"
-VIAddVersionKey "ProductVersion"  "${AppVersion}"
-# Comments is not used but left below commented out for future reference
-# VIAddVersionKey "Comments"        "Comments"
-
diff --git a/navigator/installer/windows/nsis/installer.nsi b/navigator/installer/windows/nsis/installer.nsi
deleted file mode 100644
index 0b1a8251..00000000
--- a/navigator/installer/windows/nsis/installer.nsi
+++ /dev/null
@@ -1,1042 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Also requires:
-# AppAssocReg http://nsis.sourceforge.net/Application_Association_Registration_plug-in
-# CityHash    http://mxr.mozilla.org/mozilla-central/source/other-licenses/nsis/Contrib/CityHash
-# ShellLink plugin http://nsis.sourceforge.net/ShellLink_plug-in
-# UAC         http://nsis.sourceforge.net/UAC_plug-in
-
-; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs
-!verbose 3
-
-; 7-Zip provides better compression than the lzma from NSIS so we add the files
-; uncompressed and use 7-Zip to create a SFX archive of it
-SetDatablockOptimize on
-SetCompress off
-CRCCheck on
-
-RequestExecutionLevel user
-
-; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
-; be removed after we require NSIS 3.0a2 or greater.
-!ifdef NSIS_PACKEDVERSION
-  Unicode true
-  ManifestSupportedOS all
-  ManifestDPIAware true
-!endif
-
-!addplugindir ./
-
-Var TmpVal
-Var StartMenuDir
-Var InstallType
-Var AddStartMenuSC
-Var AddTaskbarSC
-Var AddQuickLaunchSC
-Var AddDesktopSC
-Var InstallMaintenanceService
-
-; Other included files may depend upon these includes!
-; The following includes are provided by NSIS.
-!include FileFunc.nsh
-!include LogicLib.nsh
-!include WinMessages.nsh
-!include WinVer.nsh
-!include WordFunc.nsh
-!include MUI.nsh
-
-!insertmacro StrFilter
-!insertmacro GetOptions
-!insertmacro GetParameters
-!insertmacro GetSize
-!insertmacro WordFind
-
-; The following includes are custom.
-!include branding.nsi
-!include defines.nsi
-!include common.nsh
-!include locales.nsi
-!include custom.nsi
-
-VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
-VIAddVersionKey "OriginalFilename" "setup.exe"
-
-; Must be inserted before other macros that use logging
-!insertmacro _LoggingCommon
-
-; Most commonly used macros for managing shortcuts
-!insertmacro _LoggingShortcutsCommon
-
-!insertmacro AddDDEHandlerValues
-!insertmacro AddHandlerValues
-!insertmacro ChangeMUIHeaderImage
-!insertmacro CheckForFilesInUse
-!insertmacro CheckIfRegistryKeyExists
-!insertmacro CleanUpdateDirectories
-!insertmacro CopyFilesFromDir
-!insertmacro CreateRegKey
-!insertmacro FindSMProgramsDir
-!insertmacro GetPathFromString
-!insertmacro GetParent
-!insertmacro InitHashAppModelId
-!insertmacro IsHandlerForInstallDir
-!insertmacro ManualCloseAppPrompt
-!insertmacro RegCleanMain
-!insertmacro RegCleanUninstall
-!insertmacro SetBrandNameVars
-!insertmacro UnloadUAC
-!insertmacro WriteRegStr2
-!insertmacro WriteRegDWORD2
-
-!include shared.nsh
-
-; Helper macros for ui callbacks. Insert these after shared.nsh
-!insertmacro CheckCustomCommon
-!insertmacro InstallEndCleanupCommon
-!insertmacro InstallOnInitCommon
-!insertmacro InstallStartCleanupCommon
-!insertmacro LeaveDirectoryCommon
-!insertmacro LeaveOptionsCommon
-!insertmacro OnEndCommon
-!insertmacro PreDirectoryCommon
-
-Name "${BrandFullName}"
-OutFile "setup.exe"
-!ifdef HAVE_64BIT_BUILD
-  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
-!else
-  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
-!endif
-ShowInstDetails nevershow
-
-################################################################################
-# Modern User Interface - MUI
-
-!define MUI_ABORTWARNING
-!define MUI_ICON setup.ico
-!define MUI_UNICON setup.ico
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_RIGHT
-!define MUI_WELCOMEFINISHPAGE_BITMAP wizWatermark.bmp
-
-; Use a right to left header image when the language is right to left
-!ifdef ${AB_CD}_rtl
-!define MUI_HEADERIMAGE_BITMAP_RTL wizHeaderRTL.bmp
-!else
-!define MUI_HEADERIMAGE_BITMAP wizHeader.bmp
-!endif
-
-/**
- * Installation Pages
- */
-; Welcome Page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE preWelcome
-!insertmacro MUI_PAGE_WELCOME
-
-; License Page
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW showLicense
-!define MUI_LICENSEPAGE_CHECKBOX
-!insertmacro MUI_PAGE_LICENSE license.txt
-
-; Custom Options Page
-Page custom preOptions leaveOptions
-
-; Custom Components Page
-Page custom preComponents leaveComponents
-
-; Select Install Directory Page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE preDirectory
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveDirectory
-!define MUI_DIRECTORYPAGE_VERIFYONLEAVE
-!insertmacro MUI_PAGE_DIRECTORY
-
-; Custom Shortcuts Page
-Page custom preShortcuts leaveShortcuts
-
-; Start Menu Folder Page Configuration
-!define MUI_PAGE_CUSTOMFUNCTION_PRE preStartMenu
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveStartMenu
-!define MUI_STARTMENUPAGE_NODISABLE
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuDir
-
-; Custom Summary Page
-Page custom preSummary leaveSummary
-
-; Install Files Page
-!insertmacro MUI_PAGE_INSTFILES
-
-; Finish Page
-!define MUI_FINISHPAGE_TITLE_3LINES
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION LaunchApp
-!define MUI_FINISHPAGE_RUN_TEXT $(LAUNCH_TEXT)
-!define MUI_PAGE_CUSTOMFUNCTION_PRE preFinish
-!insertmacro MUI_PAGE_FINISH
-
-; Use the default dialog for IDD_VERIFY for a simple Banner
-ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe"
-
-################################################################################
-
-; Cleanup operations to perform at the start of the installation.
-Section "-InstallStartCleanup"
-  SetDetailsPrint both
-  DetailPrint $(STATUS_CLEANUP)
-  SetDetailsPrint none
-
-  SetOutPath "$INSTDIR"
-  ${StartInstallLog} "${BrandFullName}" "${AB_CD}" "${AppVersion}" "${GREVersion}"
-
-  ; Delete the app exe to prevent launching the app while we are installing.
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-  ${If} ${Errors}
-    ; If the user closed the application it can take several seconds for it to
-    ; shut down completely. If the application is being used by another user we
-    ; can rename the file and then delete is when the system is restarted.
-    Sleep 5000
-    ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-    ClearErrors
-  ${EndIf}
-
-  ${If} $InstallType == ${INSTALLTYPE_CUSTOM}
-    ; Custom installs.
-    ; If ChatZilla is installed and this install includes ChatZilla remove it
-    ; from the installation directory. This will remove it if the user
-    ; deselected ChatZilla on the components page.
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-      ${DeleteFile} "$INSTDIR\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-      ${DeleteFile} "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-      ${If} ${FileExists} "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
-        RmDir /r "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
-      ${EndIf}
-    ${EndIf}
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-      ${DeleteFile} "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-      ${If} ${FileExists} "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
-        RmDir /r "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
-      ${EndIf}
-    ${EndIf}
-
-    ; If DOMi is installed and this install includes DOMi remove it from
-    ; the installation directory. This will remove it if the user deselected
-    ; DOMi on the components page.
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\distribution\extensions\inspector@mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\extensions\inspector@mozilla.org.xpi"
-      ${If} ${FileExists} "$INSTDIR\extensions\inspector@mozilla.org"
-        RmDir /r "$INSTDIR\extensions\inspector@mozilla.org"
-      ${EndIf}
-    ${EndIf}
-
-    ; If DebugQA is installed and this install includes DebugQA remove it
-    ; from the installation directory. This will remove it if the user
-    ; deselected DebugQA on the components page.
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\distribution\extensions\debugQA@mozilla.org.xpi"
-      ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
-      ${If} ${FileExists} "$INSTDIR\extensions\debugQA@mozilla.org"
-        RmDir /r "$INSTDIR\extensions\debugQA@mozilla.org"
-      ${EndIf}
-    ${EndIf}
-
-  ${EndIf}
-
-  ; setup the application model id registration value
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
-
-  ; Remove the updates directory for Vista and above
-  ${CleanUpdateDirectories} "Mozilla\Borealis" "Mozilla\updates"
-
-  ${InstallStartCleanupCommon}
-SectionEnd
-
-Section "-Application" APP_IDX
-  ${StartUninstallLog}
-
-  SetDetailsPrint both
-  DetailPrint $(STATUS_INSTALL_APP)
-  SetDetailsPrint none
-
-  ${LogHeader} "Installing Main Files"
-  ${CopyFilesFromDir} "$EXEDIR\core" "$INSTDIR" \
-                      "$(ERROR_CREATE_DIRECTORY_PREFIX)" \
-                      "$(ERROR_CREATE_DIRECTORY_SUFFIX)"
-
-  ; distribution/extensions must exist for the optional extensions to install
-  ; properly. Ensure it is present on install, no harm if it is empty.
-  ; CreateDirectory creates nested dirs if required. If already present we'll
-  ; Just fix ourselves on ClearErrors below
-  CreateDirectory "$INSTDIR\distribution\extensions"
-
-  ; The MAPI DLL's are copied and the copies are then registered to lessen
-  ; file in use errors on application update.
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\MapiProxy_InUse.dll"
-  ${If} ${Errors}
-    ; Clear the way for the new file and delete the old file on reboot
-    Rename "$INSTDIR\MapiProxy_InUse.dll" "$INSTDIR\MapiProxy_InUse.dll.moz-delete"
-    Delete /REBOOTOK "$INSTDIR\MapiProxy_InUse.dll.moz-delete"
-  ${EndIf}
-  CopyFiles /SILENT "$EXEDIR\core\MapiProxy.dll" "$INSTDIR\MapiProxy_InUse.dll"
-  ${LogMsg} "Installed File: $INSTDIR\MapiProxy_InUse.dll"
-  ${LogUninstall} "File: \MapiProxy_InUse.dll"
-
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\mozMapi32_InUse.dll"
-  ${If} ${Errors}
-    ; Clear the way for the new file and delete the old file on reboot
-    Rename "$INSTDIR\mozMapi32_InUse.dll" "$INSTDIR\mozMapi32_InUse.dll.moz-delete"
-    Delete /REBOOTOK "$INSTDIR\mozMapi32_InUse.dll.moz-delete"
-  ${EndIf}
-  CopyFiles /SILENT "$EXEDIR\core\mozMapi32.dll" "$INSTDIR\mozMapi32_InUse.dll"
-  ${LogMsg} "Installed File: $INSTDIR\mozMapi32_InUse.dll"
-  ${LogUninstall} "File: \mozMapi32_InUse.dll"
-
-  ; Register DLLs
-  ; XXXrstrong - AccessibleMarshal.dll can be used by multiple applications but
-  ; is only registered for the last application installed. When the last
-  ; application installed is uninstalled AccessibleMarshal.dll will no longer be
-  ; registered. bug 338878
-  ${LogHeader} "DLL Registration"
-  ClearErrors
-  ${RegisterDLL} "$INSTDIR\AccessibleMarshal.dll"
-  ${If} ${Errors}
-    ${LogMsg} "** ERROR Registering: $INSTDIR\AccessibleMarshal.dll **"
-  ${Else}
-    ${LogUninstall} "DLLReg: \AccessibleMarshal.dll"
-    ${LogMsg} "Registered: $INSTDIR\AccessibleMarshal.dll"
-  ${EndIf}
-
-  ; Write extra files created by the application to the uninstall log so they
-  ; will be removed when the application is uninstalled. To remove an empty
-  ; directory write a bogus filename to the deepest directory and all empty
-  ; parent directories will be removed.
-  ${LogUninstall} "File: \components\compreg.dat"
-  ${LogUninstall} "File: \components\xpti.dat"
-  ${LogUninstall} "File: \active-update.xml"
-  ${LogUninstall} "File: \install.log"
-  ${LogUninstall} "File: \install_status.log"
-  ${LogUninstall} "File: \install_wizard.log"
-  ${LogUninstall} "File: \updates.xml"
-
-  ClearErrors
-
-  ; Default for creating Start Menu folder and shortcuts
-  ; (1 = create, 0 = don't create)
-  ${If} $AddStartMenuSC == ""
-    StrCpy $AddStartMenuSC "1"
-  ${EndIf}
-
-; Default for creating Task Bar shortcuts
-  ; (1 = create, 0 = don't create)
-  ${If} $AddTaskbarSC == ""
-    StrCpy $AddTaskbarSC "1"
-  ${EndIf}
-
-  ; Default for creating Quick Launch shortcut (1 = create, 0 = don't create)
-  ${If} $AddQuickLaunchSC == ""
-    StrCpy $AddQuickLaunchSC "1"
-  ${EndIf}
-
-  ; Default for creating Desktop shortcut (1 = create, 0 = don't create)
-  ${If} $AddDesktopSC == ""
-    StrCpy $AddDesktopSC "1"
-  ${EndIf}
-
-  ${LogHeader} "Adding Registry Entries"
-  SetShellVarContext current  ; Set SHCTX to HKCU
-  ${RegCleanMain} "Software\Mozilla"
-  ${RegCleanUninstall}
-  ${UpdateProtocolHandlers}
-
-  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
-  ${If} ${Errors}
-    StrCpy $TmpVal "HKCU" ; used primarily for logging
-  ${Else}
-    SetShellVarContext all  ; Set SHCTX to HKLM
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-    StrCpy $TmpVal "HKLM" ; used primarily for logging
-    ${RegCleanMain} "Software\Mozilla"
-    ${RegCleanUninstall}
-    ${UpdateProtocolHandlers}
-  ${EndIf}
-
-  ; The previous installer adds several registry values to both HKLM and HKCU.
-  ; We now try to add to HKLM and if that fails to HKCU
-
-  ; The order that reg keys and values are added is important if you use the
-  ; uninstall log to remove them on uninstall. When using the uninstall log you
-  ; MUST add children first so they will be removed first on uninstall so they
-  ; will be empty when the key is deleted. This allows the uninstaller to
-  ; specify that only empty keys will be deleted.
-  ${SetAppKeys}
-
-  ${FixClassKeys}
-
-  StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
-  StrCpy $2 "$\"%1$\",,0,0,,,,"
-  StrCpy $3 "$\"$8$\"  -url $\"%1$\""
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-
-  ; An empty string is used for the 5th param because BorealisHTML is not a
-  ; protocol handler
-  ${AddHandlerValues} "SOFTWARE\Classes\BorealisHTML" "$3" \
-                      "$INSTDIR\chrome\icons\default\html-file.ico,0" \
-                      "${AppRegName} Document" "" ""
-  ${AddDDEHandlerValues} "BorealisURL" "$1" "$8,0" "${AppRegName} URL" "" \
-                         "${DDEApplication}" "$2" "WWW_OpenURL"
-
-  ${FixShellIconHandler}
-
-  ; The following keys should only be set if we can write to HKLM
-  ${If} $TmpVal == "HKLM"
-    ; Uninstall keys can only exist under HKLM on some versions of windows.
-    ${SetUninstallKeys}
-
-    ; Set the Start Menu Internet and Vista Registered App HKLM registry keys.
-    ${SetStartMenuInternet}
-    ${SetClientsMail}
-
-    ; If we are writing to HKLM and create the quick launch and the desktop
-    ; shortcuts set IconsVisible to 1 otherwise to 0.
-    ; Taskbar shortcuts imply having a start menu shortcut.
-    ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
-    ${If} $AddQuickLaunchSC == 1
-    ${OrIf} $AddDesktopSC == 1
-    ${OrIf} $AddTaskbarSC == 1
-      StrCpy $0 "Software\Clients\StartMenuInternet\$R9\InstallInfo"
-      WriteRegDWORD HKLM "$0" "IconsVisible" 1
-      StrCpy $0 "Software\Clients\Mail\${BrandFullNameInternal}\InstallInfo"
-      WriteRegDWORD HKLM "$0" "IconsVisible" 1
-    ${Else}
-      StrCpy $0 "Software\Clients\StartMenuInternet\$R9\InstallInfo"
-      WriteRegDWORD HKLM "$0" "IconsVisible" 0
-      StrCpy $0 "Software\Clients\Mail\${BrandFullNameInternal}\InstallInfo"
-      WriteRegDWORD HKLM "$0" "IconsVisible" 0
-    ${EndIf}
-  ${EndIf}
-
-  ; These need special handling on uninstall since they may be overwritten by
-  ; an install into a different location.
-  StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}"
-  ${WriteRegStr2} $TmpVal "$0" "" "$INSTDIR\${FileMainEXE}" 0
-  ${WriteRegStr2} $TmpVal "$0" "Path" "$INSTDIR" 0
-
-  StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\$R9"
-  ${CreateRegKey} "$TmpVal" "$0" 0
-  StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
-  ${CreateRegKey} "$TmpVal" "$0" 0
-
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
-  ; Create shortcuts
-  ${LogHeader} "Adding Shortcuts"
-
-  ; Always add the relative path to the application's Start Menu directory and
-  ; the application's shortcuts to the shortcuts log ini file. The
-  ; DeleteShortcuts macro will do the right thing on uninstall if they don't
-  ; exist.
-  ${LogSMProgramsDirRelPath} "$StartMenuDir"
-  ${LogSMProgramsShortcut} "${BrandFullName}.lnk"
-  ${LogSMProgramsShortcut} "${BrandFullName} ($(SAFE_MODE)).lnk"
-  ${LogSMProgramsShortcut} "${BrandFullNameInternal} $(MAILNEWS_TEXT).lnk"
-  ${LogSMProgramsShortcut} "$(PROFILE_TEXT).lnk"
-  ${LogQuickLaunchShortcut} "${BrandFullName}.lnk"
-  ${LogDesktopShortcut} "${BrandFullName}.lnk"
-
-  ${If} $AddStartMenuSC == 1
-    ${Unless} ${FileExists} "$SMPROGRAMS\$StartMenuDir"
-      CreateDirectory "$SMPROGRAMS\$StartMenuDir"
-      ${LogMsg} "Added Start Menu Directory: $SMPROGRAMS\$StartMenuDir"
-    ${EndUnless}
-    CreateShortCut "$SMPROGRAMS\$StartMenuDir\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-    ${If} ${AtLeastWin7}
-    ${AndIf} "$AppUserModelID" != ""
-      ApplicationID::Set "$SMPROGRAMS\$StartMenuDir\${BrandFullName}.lnk" "$AppUserModelID"
-    ${EndIf}
-    ${LogMsg} "Added Shortcut: $SMPROGRAMS\$StartMenuDir\${BrandFullName}.lnk"
-    CreateShortCut "$SMPROGRAMS\$StartMenuDir\${BrandFullName} ($(SAFE_MODE)).lnk" "$INSTDIR\${FileMainEXE}" "-safe-mode" "$INSTDIR\${FileMainEXE}" 0
-    ${If} ${AtLeastWin7}
-    ${AndIf} "$AppUserModelID" != ""
-      ApplicationID::Set "$SMPROGRAMS\$StartMenuDir\${BrandFullName} ($(SAFE_MODE)).lnk" "$AppUserModelID"
-    ${EndIf}
-    ${LogMsg} "Added Shortcut: $SMPROGRAMS\$StartMenuDir\${BrandFullName} ($(SAFE_MODE)).lnk"
-    CreateShortCut "$SMPROGRAMS\$StartMenuDir\${BrandFullName} $(MAILNEWS_TEXT).lnk" "$INSTDIR\${FileMainEXE}" "-mail" "$INSTDIR\chrome\icons\default\messengerWindow.ico" 0
-    ${LogMsg} "Added Shortcut: $SMPROGRAMS\$StartMenuDir\${BrandFullName} $(MAILNEWS_TEXT).lnk"
-    CreateShortCut "$SMPROGRAMS\$StartMenuDir\$(PROFILE_TEXT).lnk" "$INSTDIR\${FileMainEXE}" "-profileManager" "$INSTDIR\${FileMainEXE}" 0
-    ${LogMsg} "Added Shortcut: $SMPROGRAMS\$StartMenuDir\$(PROFILE_TEXT).lnk"
-  ${EndIf}
-
-  ${If} $AddQuickLaunchSC == 1
-    CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-    ${If} ${AtLeastWin7}
-    ${AndIf} "$AppUserModelID" != ""
-      ApplicationID::Set "$QUICKLAUNCH\${BrandFullName}.lnk" "$AppUserModelID"
-    ${EndIf}
-    ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandFullName}.lnk"
-  ${EndIf}
-
-  ${If} $AddDesktopSC == 1
-    CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-    ${If} ${AtLeastWin7}
-    ${AndIf} "$AppUserModelID" != ""
-      ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"
-    ${EndIf}
-    ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk"
-  ${EndIf}
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-SectionEnd
-
-Section /o "IRC Client" CZ_IDX
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-    SetDetailsPrint both
-    DetailPrint $(STATUS_INSTALL_OPTIONAL)
-    SetDetailsPrint none
-
-    ${RemoveDir} "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
-    ${RemoveDir} "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
-    ${DeleteFile} "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-    ${DeleteFile} "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi"
-    ${DeleteFile} "$INSTDIR\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-    ${DeleteFile} "$INSTDIR\distribution\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi"
-    ClearErrors
-    ${LogHeader} "Installing IRC Client"
-    CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi" \
-                      "$INSTDIR\distribution\extensions\"
-    ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi"
-      CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\langpack-${AB_CD}@chatzilla.mozilla.org.xpi" \
-                        "$INSTDIR\distribution\extensions\"
-    ${EndIf}
-  ${EndIf}
-SectionEnd
-
-Section /o "Developer Tools" DOMI_IDX
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi"
-    SetDetailsPrint both
-    DetailPrint $(STATUS_INSTALL_OPTIONAL)
-    SetDetailsPrint none
-
-    ${RemoveDir} "$INSTDIR\extensions\inspector@mozilla.org"
-    ${DeleteFile} "$INSTDIR\extensions\inspector@mozilla.org.xpi"
-    ${DeleteFile} "$INSTDIR\distribution\extensions\inspector@mozilla.org.xpi"
-    ClearErrors
-    ${LogHeader} "Installing Developer Tools"
-    CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi" \
-                      "$INSTDIR\distribution\extensions\"
-  ${EndIf}
-SectionEnd
-
-Section /o "Debug and QA Tools" DEBUG_IDX
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
-    SetDetailsPrint both
-    DetailPrint $(STATUS_INSTALL_OPTIONAL)
-    SetDetailsPrint none
-
-    ${RemoveDir} "$INSTDIR\extensions\debugQA@mozilla.org"
-    ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
-    ${DeleteFile} "$INSTDIR\distribution\extensions\debugQA@mozilla.org.xpi"
-    ClearErrors
-    ${LogHeader} "Installing Debug and QA Tools"
-    CopyFiles /SILENT "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi" \
-                      "$INSTDIR\distribution\extensions\"
-  ${EndIf}
-SectionEnd
-
-; Cleanup operations to perform at the end of the installation.
-Section "-InstallEndCleanup"
-  SetDetailsPrint both
-  DetailPrint "$(STATUS_CLEANUP)"
-  SetDetailsPrint none
-
-  ; Refresh desktop icons
-  System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
-
-  ${InstallEndCleanupCommon}
-
-  ; If we have to reboot give SHChangeNotify time to finish the refreshing
-  ; the icons so the OS doesn't display the icons from helper.exe
-  ${If} ${RebootFlag}
-    Sleep 10000
-    ${LogHeader} "Reboot Required To Finish Installation"
-    ; ${FileMainEXE}.moz-upgrade should never exist but just in case...
-    ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade"
-      Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-upgrade"
-    ${EndUnless}
-
-    ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
-      ClearErrors
-      Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-delete"
-      ${Unless} ${Errors}
-        Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete"
-      ${EndUnless}
-    ${EndUnless}
-    ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}"
-      CopyFiles /SILENT "$INSTDIR\uninstall\helper.exe" "$INSTDIR"
-      FileOpen $0 "$INSTDIR\${FileMainEXE}" w
-      FileWrite $0 "Will be deleted on restart"
-      Rename /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}"
-      FileClose $0
-      Delete "$INSTDIR\${FileMainEXE}"
-      Rename "$INSTDIR\helper.exe" "$INSTDIR\${FileMainEXE}"
-    ${EndUnless}
-  ${EndIf}
-SectionEnd
-
-Function CheckExistingInstall
-  ; If there is a pending file copy from a previous uninstall don't allow
-  ; installing until after the system has rebooted.
-  IfFileExists "$INSTDIR\${FileMainEXE}.moz-upgrade" +1 +4
-  MessageBox MB_YESNO "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +2
-  Reboot
-  Quit
-
-  ; If there is a pending file deletion from a previous uninstall don't allow
-  ; installing until after the system has rebooted.
-  IfFileExists "$INSTDIR\${FileMainEXE}.moz-delete" +1 +4
-  MessageBox MB_YESNO "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +2
-  Reboot
-  Quit
-
-  ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
-    Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)"
-    ${If} "$TmpVal" == "FoundMessageWindow"
-      Sleep 5000
-    ${EndIf}
-    ${PushFilesToCheck}
-    ; Store the return value in $TmpVal so it is less likely to be accidentally
-    ; overwritten elsewhere.
-    ${CheckForFilesInUse} $TmpVal
-
-    Banner::destroy
-
-    ${If} "$TmpVal" == "true"
-      StrCpy $TmpVal "FoundMessageWindow"
-      ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)"
-      StrCpy $TmpVal "true"
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
-
-Function LaunchApp
-  GetFunctionAddress $0 LaunchAppFromElevatedProcess
-  UAC::ExecCodeSegment $0
-FunctionEnd
-
-Function LaunchAppFromElevatedProcess
-  ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
-  ; Find the installation directory when launching using GetFunctionAddress
-  ; from an elevated installer since $INSTDIR will not be set in this installer
-  ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
-  ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" ""
-  ${GetPathFromString} "$0" $0
-  ${GetParent} "$0" $1
-  ; Set our current working directory to the application's install directory
-  ; otherwise the 7-Zip temp directory will be in use and won't be deleted.
-  SetOutPath "$1"
-  Exec "$\"$0$\""
-FunctionEnd
-
-################################################################################
-# Language
-
-!insertmacro MOZ_MUI_LANGUAGE 'baseLocale'
-!verbose push
-!verbose 3
-!include "overrideLocale.nsh"
-!include "customLocale.nsh"
-!verbose pop
-
-; Set this after the locale files to override it if it is in the locale
-; using " " for BrandingText will hide the "Nullsoft Install System..." branding
-BrandingText " "
-
-################################################################################
-# Page pre and leave functions
-
-Function preWelcome
-  ${If} ${FileExists} "$EXEDIR\core\distribution\modern-wizard.bmp"
-    Delete "$PLUGINSDIR\modern-wizard.bmp"
-    CopyFiles /SILENT "$EXEDIR\core\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp"
-  ${EndIf}
-FunctionEnd
-
-Function showLicense
-  ${If} ${FileExists} "$EXEDIR\core\distribution\modern-header.bmp"
-  ${AndIf} $hHeaderBitmap == ""
-    Delete "$PLUGINSDIR\modern-header.bmp"
-    CopyFiles /SILENT "$EXEDIR\core\distribution\modern-header.bmp" "$PLUGINSDIR\modern-header.bmp"
-    ${ChangeMUIHeaderImage} "$PLUGINSDIR\modern-header.bmp"
-  ${EndIf}
-FunctionEnd
-
-Function preOptions
-  !insertmacro MUI_HEADER_TEXT "$(OPTIONS_PAGE_TITLE)" "$(OPTIONS_PAGE_SUBTITLE)"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "options.ini"
-FunctionEnd
-
-Function leaveOptions
-  ${MUI_INSTALLOPTIONS_READ} $0 "options.ini" "Settings" "State"
-  ${If} $0 != 0
-    Abort
-  ${EndIf}
-  ${MUI_INSTALLOPTIONS_READ} $R0 "options.ini" "Field 2" "State"
-  StrCmp $R0 "1" +1 +2
-  StrCpy $InstallType ${INSTALLTYPE_BASIC}
-  ${MUI_INSTALLOPTIONS_READ} $R0 "options.ini" "Field 3" "State"
-  StrCmp $R0 "1" +1 +2
-  StrCpy $InstallType ${INSTALLTYPE_CUSTOM}
-
-  ${LeaveOptionsCommon}
-
-  ${If} $InstallType == ${INSTALLTYPE_BASIC}
-    Call CheckExistingInstall
-  ${EndIf}
-FunctionEnd
-
-Function preComponents
-  ${CheckCustomCommon}
-  !insertmacro checkSuiteComponents
-  !insertmacro MUI_HEADER_TEXT "$(OPTIONAL_COMPONENTS_TITLE)" "$(OPTIONAL_COMPONENTS_SUBTITLE)"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "components.ini"
-FunctionEnd
-
-Function leaveComponents
-  ; If ChatZilla exists then it will be Field 2.
-  ; If ChatZilla doesn't exist then DOMi will be Field 2 (when ChatZilla and DOMi
-  ; don't exist, debugQA will be Field 2).
-  StrCpy $R1 2
-
- ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi"
-    ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
-    ; State will be 1 for checked and 0 for unchecked so we can use that to set
-    ; the section flags for installation.
-    SectionSetFlags ${CZ_IDX} $R0
-    IntOp $R1 $R1 + 1
-  ${Else}
-    SectionSetFlags ${CZ_IDX} 0 ; Disable install for chatzilla
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\inspector@mozilla.org.xpi"
-    ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
-    ; State will be 1 for checked and 0 for unchecked so we can use that to set
-    ; the section flags for installation.
-    SectionSetFlags ${DOMI_IDX} $R0
-    IntOp $R1 $R1 + 1
-  ${Else}
-    SectionSetFlags ${DOMI_IDX} 0 ; Disable install for DOMi
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\distribution\extensions\debugQA@mozilla.org.xpi"
-    ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
-    ; State will be 1 for checked and 0 for unchecked so we can use that to set
-    ; the section flags for installation.
-    SectionSetFlags ${DEBUG_IDX} $R0
-    IntOp $R1 $R1 + 1
-  ${Else}
-    SectionSetFlags ${DEBUG_IDX} 0 ; Disable install for debugQA
-  ${EndIf}
-
-FunctionEnd
-
-Function preDirectory
-  ${PreDirectoryCommon}
-FunctionEnd
-
-Function leaveDirectory
-  ${If} $InstallType == ${INSTALLTYPE_BASIC}
-    Call CheckExistingInstall
-  ${EndIf}
-  ${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)"
-FunctionEnd
-
-Function preShortcuts
-  ${CheckCustomCommon}
-  !insertmacro MUI_HEADER_TEXT "$(SHORTCUTS_PAGE_TITLE)" "$(SHORTCUTS_PAGE_SUBTITLE)"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "shortcuts.ini"
-FunctionEnd
-
-Function leaveShortcuts
-  ${MUI_INSTALLOPTIONS_READ} $0 "shortcuts.ini" "Settings" "State"
-  ${If} $0 != 0
-    Abort
-  ${EndIf}
-  ${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State"
-  ${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
-  ${MUI_INSTALLOPTIONS_READ} $AddQuickLaunchSC "shortcuts.ini" "Field 4" "State"
-
-  ; If Start Menu shortcuts won't be created call CheckExistingInstall here
-  ; since leaveStartMenu will not be called.
-  ${If} $AddStartMenuSC != 1
-  ${AndIf} $InstallType == ${INSTALLTYPE_CUSTOM}
-    Call CheckExistingInstall
-  ${EndIf}
-FunctionEnd
-
-Function preStartMenu
-  ; With the Unicode installer the path to the application's Start Menu
-  ; directory relative to the Start Menu's Programs directory is written to the
-  ; shortcuts log ini file and is used to set the default Start Menu directory.
-  ${GetSMProgramsDirRelPath} $0
-  ${If} "$0" != ""
-    StrCpy $StartMenuDir "$0"
-  ${Else}
-    ; Prior to the Unicode installer the path to the application's Start Menu
-    ; directory relative to the Start Menu's Programs directory was written to
-    ; the registry and use this value to set the default Start Menu directory.
-    ClearErrors
-    ReadRegStr $0 HKLM "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Main" "Start Menu Folder"
-    ${If} ${Errors}
-      ; Use the FindSMProgramsDir macro to find a previously used path to the
-      ; application's Start Menu directory relative to the Start Menu's Programs
-      ; directory in the uninstall log and use this value to set the default
-      ; Start Menu directory.
-      ${FindSMProgramsDir} $0
-      ${If} "$0" != ""
-        StrCpy $StartMenuDir "$0"
-      ${EndIf}
-    ${Else}
-      StrCpy $StartMenuDir "$0"
-    ${EndUnless}
-  ${EndIf}
-
-  ${CheckCustomCommon}
-  ${If} $AddStartMenuSC != 1
-    Abort
-  ${EndIf}
-FunctionEnd
-
-Function leaveStartMenu
-  ${If} $InstallType == ${INSTALLTYPE_CUSTOM}
-    Call CheckExistingInstall
-  ${EndIf}
-FunctionEnd
-
-Function preSummary
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "3"
-
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Text   "$(SUMMARY_INSTALLED_TO)"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Bottom "15"
-
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Type   "text"
-  ; The contents of this control must be set as follows in the pre function
-  ; ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND"
-  ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" state  ""
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Left   "0"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Top    "17"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Bottom "30"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" flags  "READONLY"
-
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Type   "label"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Text   "$(SUMMARY_CLICK)"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Left   "0"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Top    "130"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Bottom "150"
-
-  ${If} "$TmpVal" == "true"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Type   "label"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Text   "$(SUMMARY_REBOOT_REQUIRED_INSTALL)"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Left   "0"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Top    "35"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Bottom "45"
-
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4"
-  ${EndIf}
-
-  !insertmacro MUI_HEADER_TEXT "$(SUMMARY_PAGE_TITLE)" "$(SUMMARY_PAGE_SUBTITLE)"
-
-  ; The Summary custom page has a textbox that will automatically receive
-  ; focus. This sets the focus to the Install button instead.
-  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "summary.ini"
-  GetDlgItem $0 $HWNDPARENT 1
-  System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i"
-  ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND"
-  SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-FunctionEnd
-
-Function leaveSummary
-  ${If} $InstallType != ${INSTALLTYPE_CUSTOM}
-    ; Set DOM Inspector, ChatZilla to be installed
-    SectionSetFlags ${DOMI_IDX} 1
-    SectionSetFlags ${CZ_IDX} 1
-  ${EndIf}
-  ; Try to delete the app executable and if we can't delete it try to find the
-  ; app's message window and prompt the user to close the app. This allows
-  ; running an instance that is located in another directory. If for whatever
-  ; reason there is no message window we will just rename the app's files and
-  ; then remove them on restart.
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-  ${If} ${Errors}
-    ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)"
-  ${EndIf}
-FunctionEnd
-
-; When we add an optional action to the finish page the cancel button is
-; enabled. This disables it and leaves the finish button as the only choice.
-Function preFinish
-  ${EndInstallLog} "${BrandFullName}"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0"
-FunctionEnd
-
-################################################################################
-# Initialization Functions
-
-Function .onInit
-  StrCpy $LANGUAGE 0
-  ${SetBrandNameVars} "$EXEDIR\core\distribution\setup.ini"
-
-  ; Don't install on systems that don't support SSE2. The parameter value of
-  ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the
-  ; SSE2 instruction set is available. Result returned in $R7.
-  System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7"
-
-  ; Windows XP SP1 and lower are not supported.
-  ${If} ${AtMostWinXP}
-    ${IfNot} ${ISWinXP}
-    ${OrIfNot} ${AtLeastServicePack} 2
-      ${If} "$R7" == "0"
-        strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
-      ${Else}
-        strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_MSG)"
-      ${EndIf}
-      MessageBox MB_OKCANCEL|MB_ICONSTOP "$R7" IDCANCEL +2
-      ExecShell "open" "${URLSystemRequirements}"
-      Quit
-    ${EndIf}
-  ${EndIf}
-
-  ; SSE2 CPU support
-  ${If} "$R7" == "0"
-    MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_CPU_MSG)" IDCANCEL +2
-    ExecShell "open" "${URLSystemRequirements}"
-    Quit
-  ${EndIf}
-
-!ifdef HAVE_64BIT_BUILD
-  ${Unless} ${RunningX64}
-  ${AndUnless} ${AtLeastWin7}
-    MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2
-    ExecShell "open" "${URLSystemRequirements}"
-    Quit
-  ${EndUnless}
-  SetRegView 64
-!endif
-
-  ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
-
-
-  !insertmacro InitInstallOptionsFile "options.ini"
-  !insertmacro InitInstallOptionsFile "components.ini"
-  !insertmacro InitInstallOptionsFile "shortcuts.ini"
-  !insertmacro InitInstallOptionsFile "summary.ini"
-
-  ; Setup the options.ini file for the Custom Options Page
-  WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text   "$(OPTIONS_SUMMARY)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Top    "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Bottom "10"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Text   "$(OPTION_STANDARD_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Top    "25"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Bottom "35"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" State  "1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Flags  "GROUP"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Text   "$(OPTION_CUSTOM_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Top    "55"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Bottom "65"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" State  "0"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Text   "$(OPTION_STANDARD_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Top    "37"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Bottom "57"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text   "$(OPTION_CUSTOM_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top    "67"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87"
-
-  ; Setup the components.ini file for the Components page
-  !insertmacro createSuiteComponentsINI
-
-  ; Setup the shortcuts.ini file for the Custom Shortcuts Page
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text   "$(CREATE_ICONS_DESC)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Bottom "15"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Text   "$(ICONS_DESKTOP)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Left   "15"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Top    "20"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Bottom "30"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" State  "1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Flags  "GROUP"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text   "$(ICONS_STARTMENU)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left   "15"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top    "40"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State  "1"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Text   "$(ICONS_QUICKLAUNCH)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Left   "15"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Top    "60"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Bottom "70"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" State  "1"
-
-  ; There must always be a core directory
-  ${GetSize} "$EXEDIR\core\" "/S=0K" $R5 $R7 $R8
-  ; Add 1024 Kb to the diskspace requirement since the installer makes a copy
-  ; of the MAPI dll's (around 20 Kb)... also, see Bug 434338.
-  IntOp $R5 $R5 + 1024
-  SectionSetSize ${APP_IDX} $R5
-
-  ; Initialize $hHeaderBitmap to prevent redundant changing of the bitmap if
-  ; the user clicks the back button
-  StrCpy $hHeaderBitmap ""
-FunctionEnd
-
-Function .onGUIEnd
-  ${OnEndCommon}
-FunctionEnd
diff --git a/navigator/installer/windows/nsis/shared.nsh b/navigator/installer/windows/nsis/shared.nsh
deleted file mode 100644
index 0e1bf93a..00000000
--- a/navigator/installer/windows/nsis/shared.nsh
+++ /dev/null
@@ -1,1044 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-!macro PostUpdate
-  ${CreateShortcutsLog}
-
-  ; Remove registry entries for non-existent apps and for apps that point to our
-  ; install location in the Software\Mozilla key and uninstall registry entries
-  ; that point to our install location for both HKCU and HKLM.
-  SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU) 
-  ${RegCleanMain} "Software\Mozilla"
-  ${RegCleanUninstall}
-  ${UpdateProtocolHandlers}
-
-  ; Win7 taskbar and start menu link maintenance
-  ${If} ${AtLeastWin7}
-  ${AndIf} "$AppUserModelID" != ""
-    ${UpdateShortcutAppModelIDs} "$INSTDIR\${FileMainEXE}" "$AppUserModelID" $0
-  ${EndIf}
-
-  ; Upgrade the copies of the MAPI DLLs
-  ${UpgradeMapiDLLs}
-
-  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
-  ${If} ${Errors}
-    StrCpy $TmpVal "HKCU" ; used primarily for logging
-  ${Else}
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-    SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM)
-    StrCpy $TmpVal "HKLM" ; used primarily for logging
-    ${RegCleanMain} "Software\Mozilla"
-    ${RegCleanUninstall}
-    ${SetStartMenuInternet}
-    ${FixShellIconHandler}
-    ${SetUninstallKeys}
-    ${UpdateProtocolHandlers}
-
-    ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
-    ${If} "$0" != "${GREVersion}"
-      WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
-    ${EndIf}
-
-    ; Only update the Clients\Mail registry key values if they don't exist or
-    ; this installation is the same as the one set in those keys.
-    ReadRegStr $0 HKLM "Software\Clients\Mail\${BrandFullNameInternal}\DefaultIcon" ""
-    ${GetPathFromString} "$0" $0
-    ${GetParent} "$0" $0
-    ${If} ${FileExists} "$0"
-      ${GetLongPath} "$0" $0
-    ${EndIf}
-    ${If} "$0" == "$INSTDIR"
-      ${SetClientsMail}
-    ${EndIf}
-
-    ; Only update the Clients\News registry key values if they don't exist or
-    ; this installation is the same as the one set in those keys.
-    ReadRegStr $0 HKLM "Software\Clients\News\${BrandFullNameInternal}\DefaultIcon" ""
-    ${GetPathFromString} "$0" $0
-    ${GetParent} "$0" $0
-    ${If} ${FileExists} "$0"
-      ${GetLongPath} "$0" $0
-    ${EndIf}
-    ${If} "$0" == "$INSTDIR"
-      ${SetClientsNews}
-    ${EndIf}
-  ${EndIf}
-
-  ${RemoveDeprecatedKeys}
-  ; Add Software\Mozilla\ registry entries
-  ${SetAppKeys}
-
-  ${FixClassKeys}
-
-  ; Remove files that may be left behind by the application in the
-  ; VirtualStore directory.
-  ${CleanVirtualStore}
-!macroend
-!define PostUpdate "!insertmacro PostUpdate"
-
-!macro SetAsDefaultAppUser
-  SetShellVarContext current
-
-  ; It is only possible to set this installation of the application as the
-  ; handler for the various types if those types were added to the respective
-  ; HKLM\Clients registry keys.
-  ; http://support.microsoft.com/kb/297878
-  ${GetParameters} $R0
-
-  ClearErrors
-  ${GetOptions} "$R0" "Browser" $R1
-  ${Unless} ${Errors}
-    ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
-    ClearErrors
-    ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" ""
-    ${GetPathFromString} "$0" $0
-    ${GetParent} "$0" $0
-    ${If} ${FileExists} "$0"
-      ${GetLongPath} "$0" $0
-    ${EndIf}
-    ${If} "$0" != "$INSTDIR"
-      DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-      ClearErrors
-      WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
-      ${If} ${Errors}
-        ; Prevent multiple elevation requests
-        ClearErrors
-        ${GetOptions} "$R0" "/UAC:" $R1
-        ${Unless} ${Errors}
-          Quit
-        ${EndUnless}
-        ${ElevateUAC}
-      ${EndIf}
-      DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-      ${SetStartMenuInternet}
-    ${EndIf}
-    SetShellVarContext all  ; Set SHCTX to all users (e.g. HKLM)
-    ${FixShellIconHandler}
-    WriteRegStr HKCU "Software\Clients\StartMenuInternet" "" "$R9"
-
-    ${If} ${AtLeastWinVista}
-      ClearErrors
-      ReadRegStr $0 HKLM "Software\RegisteredApplications" "${AppRegName}"
-      ; Only register as the handler on Vista if the app registry name exists
-      ; under the RegisteredApplications registry key.
-      ${Unless} ${Errors}
-        AppAssocReg::SetAppAsDefaultAll "${AppRegName}"
-      ${EndUnless}
-    ${EndIf}
-
-    SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-    ${SetHandlersBrowser}
-  ${EndUnless} 
-
-  ClearErrors
-  ${GetOptions} "$R0" "Mail" $R1
-  ${Unless} ${Errors}
-    ReadRegStr $0 HKLM "Software\Clients\Mail\${BrandFullNameInternal}\DefaultIcon" ""
-    ${GetPathFromString} "$0" $0
-    ${GetParent} "$0" $0
-    ${If} ${FileExists} "$0"
-      ${GetLongPath} "$0" $0
-    ${EndIf}
-    ${If} "$0" != "$INSTDIR"
-      DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-      ClearErrors
-      WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
-      ${If} ${Errors}
-        ; Prevent multiple elevation requests
-        ClearErrors
-        ${GetOptions} "$R0" "/UAC:" $R1
-        ${Unless} ${Errors}
-          Quit
-        ${EndUnless}
-        ${ElevateUAC}
-      ${EndIf}
-      DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-      SetShellVarContext all     ; Set SHCTX to all users (e.g. HKLM)
-      ${SetClientsMail}
-    ${EndIf}
-    WriteRegStr HKCU "Software\Clients\Mail" "" "${BrandFullNameInternal}"
-    GetFunctionAddress $0 SetAsDefaultMailAppUser
-    UAC::ExecCodeSegment $0
-  ${EndUnless}
-
-  ClearErrors
-  ${GetOptions} "$R0" "News" $R1
-  ${Unless} ${Errors}
-    ReadRegStr $0 HKLM "Software\Clients\News\${BrandFullNameInternal}\DefaultIcon" ""
-    ${GetPathFromString} "$0" $0
-    ${GetParent} "$0" $0
-    ${If} ${FileExists} "$0"
-      ${GetLongPath} "$0" $0
-    ${EndIf}
-    ${If} "$0" != "$INSTDIR"
-      DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-      ClearErrors
-      WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
-      ${If} ${Errors}
-        ; Prevent multiple elevation requests
-        ClearErrors
-        ${GetOptions} "$R0" "/UAC:" $R1
-        ${Unless} ${Errors}
-          Quit
-        ${EndUnless}
-        ${ElevateUAC}
-      ${EndIf}
-      DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-      SetShellVarContext all     ; Set SHCTX to all users (e.g. HKLM)
-      ${SetClientsNews}
-    ${EndIf}
-    WriteRegStr HKCU "Software\Clients\News" "" "${BrandFullNameInternal}"
-    GetFunctionAddress $0 SetAsDefaultNewsAppUser
-    UAC::ExecCodeSegment $0
-  ${EndUnless}
-!macroend
-!define SetAsDefaultAppUser "!insertmacro SetAsDefaultAppUser"
-
-!macro SetAsDefaultAppGlobal
-  ${RemoveDeprecatedKeys}
-  SetShellVarContext all      ; Set SHCTX to all users (e.g. HKLM)
-  ; Make sure that the MapiProxy and the mozMapi32 dll copies exist as we will
-  ; use those to register as default mail app. When using a ZIP build, the DLL 
-  ; copies might not exist yet
-  IfFileExists "$INSTDIR\MapiProxy_InUse.dll" +2 +1
-  CopyFiles /SILENT "$INSTDIR\MapiProxy.dll" "$INSTDIR\MapiProxy_InUse.dll"
-  IfFileExists "$INSTDIR\mozMapi32_InUse.dll" +2 +1
-  CopyFiles /SILENT "$INSTDIR\mozMapi32.dll" "$INSTDIR\mozMapi32_InUse.dll"
-
-  ${SetHandlersBrowser}
-  ${SetHandlersMail}
-  ${SetHandlersNews}
-  ${SetStartMenuInternet}
-  ${SetClientsMail}
-  ${SetClientsNews}
-  ${FixShellIconHandler}
-  ${ShowShortcuts}
-  ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
-  WriteRegStr HKLM "Software\Clients\StartMenuInternet" "" "$R9"
-  WriteRegStr HKLM "Software\Clients\Mail" "" "${BrandFullNameInternal}"
-!macroend
-!define SetAsDefaultAppGlobal "!insertmacro SetAsDefaultAppGlobal"
-
-!macro HideShortcuts
-  StrCpy $R1 "Software\Clients\Mail\${BrandFullNameInternal}\InstallInfo"
-  WriteRegDWORD HKLM $R1 "IconsVisible" 0
-  SetShellVarContext all  ; Set $DESKTOP to All Users
-  ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
-    SetShellVarContext current  ; Set $DESKTOP to the current user's desktop
-  ${EndUnless}
-
-  ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
-    ShellLink::GetShortCutArgs "$DESKTOP\${BrandFullName}.lnk"
-    Pop $0
-    ${If} "$0" == ""
-      ShellLink::GetShortCutTarget "$DESKTOP\${BrandFullName}.lnk"
-      Pop $0
-      ; Needs to handle short paths
-      ${If} "$0" == "$INSTDIR\${FileMainEXE}"
-        Delete "$DESKTOP\${BrandFullName}.lnk"
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-
-  ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"
-    ShellLink::GetShortCutArgs "$QUICKLAUNCH\${BrandFullName}.lnk"
-    Pop $0
-    ${If} "$0" == ""
-      ShellLink::GetShortCutTarget "$QUICKLAUNCH\${BrandFullName}.lnk"
-      Pop $0
-      ; Needs to handle short paths
-      ${If} "$0" == "$INSTDIR\${FileMainEXE}"
-        Delete "$QUICKLAUNCH\${BrandFullName}.lnk"
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-!macroend
-!define HideShortcuts "!insertmacro HideShortcuts"
-
-!macro ShowShortcuts
-  StrCpy $R1 "Software\Clients\Mail\${BrandFullNameInternal}\InstallInfo"
-  WriteRegDWORD HKLM $R1 "IconsVisible" 1
-  SetShellVarContext all  ; Set $DESKTOP to All Users
-  ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
-    CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-    ${If} ${AtLeastWin7}
-    ${AndIf} "$AppUserModelID" != ""
-      ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"
-    ${EndIf}
-    ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR"
-    ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
-      SetShellVarContext current  ; Set $DESKTOP to the current user's desktop
-      ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"
-        CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-        ${If} ${AtLeastWin7}
-        ${AndIf} "$AppUserModelID" != ""
-          ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"
-        ${EndIf}
-        ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR"
-      ${EndUnless}
-    ${EndUnless}
-  ${EndUnless}
-  ${Unless} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"
-    CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0
-    ${If} ${AtLeastWin7}
-    ${AndIf} "$AppUserModelID" != ""
-      ApplicationID::Set "$QUICKLAUNCH\${BrandFullName}.lnk" "$AppUserModelID"
-    ${EndIf}
-    ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR"
-  ${EndUnless}
-!macroend
-!define ShowShortcuts "!insertmacro ShowShortcuts"
-
-!macro SetHandlersBrowser
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-
-  StrCpy $0 "SOFTWARE\Classes"
-  StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
-  StrCpy $2 "$\"$8$\" -url $\"%1$\""
-  StrCpy $3 "$\"%1$\",,0,0,,,,"
-
-  ; An empty string is used for the 5th param because BorealisHTML is not a
-  ; protocol handler
-  ${AddHandlerValues} "$0\BorealisHTML" "$2" \
-                      "$INSTDIR\chrome\icons\default\html-file.ico,0" \
-                      "${AppRegName} Document" "" ""
-  ${AddDDEHandlerValues} "BorealisURL" "$1" "$8,0" "${AppRegName} URL" "delete" \
-                         "${DDEApplication}" "$3" "WWW_OpenURL"
-
-  ; An empty string is used for the 4th & 5th params because the following
-  ; protocol handlers already have a display name and additional keys required
-  ; for a protocol handler.
-  ${AddDDEHandlerValues} "ftp" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
-  ${AddDDEHandlerValues} "http" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
-  ${AddDDEHandlerValues} "https" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
-
-  ReadRegStr $6 HKCR ".htm" ""
-  ${If} "$6" != "BorealisHTML"
-    WriteRegStr SHCTX "$0\.htm" "" "BorealisHTML"
-  ${EndIf}
-
-  ReadRegStr $6 HKCR ".html" ""
-  ${If} "$6" != "BorealisHTML"
-    WriteRegStr SHCTX "$0\.html" "" "BorealisHTML"
-  ${EndIf}
-
-  ReadRegStr $6 HKCR ".shtml" ""
-  ${If} "$6" != "BorealisHTML"
-    WriteRegStr SHCTX "$0\.shtml" "" "BorealisHTML"
-  ${EndIf}
-
-  ReadRegStr $6 HKCR ".xht" ""
-  ${If} "$6" != "BorealisHTML"
-     WriteRegStr SHCTX "$0\.xht" "" "BorealisHTML"
-  ${EndIf}
-
-  ReadRegStr $6 HKCR ".xhtml" ""
-  ${If} "$6" != "BorealisHTML"
-    WriteRegStr SHCTX "$0\.xhtml" "" "BorealisHTML"
-  ${EndIf}
-
-  ; Only add webm if it's not present
-  ${CheckIfRegistryKeyExists} "$0" ".webm" $7
-  ${If} $7 == "false"
-    WriteRegStr SHCTX "$0\.webm"  "" "BorealisHTML"
-  ${EndIf}
-!macroend
-!define SetHandlersBrowser "!insertmacro SetHandlersBrowser"
-
-!macro SetHandlersMail
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-
-  StrCpy $0 "SOFTWARE\Classes"
-  StrCpy $1 "$\"$8$\" $\"%1$\""
-  StrCpy $2 "$\"$8$\" -osint -compose $\"%1$\""
-
-  ; An empty string is used for the 5th param because BorealisEML is not a
-  ; protocol handler
-  ${AddHandlerValues} "$0\BorealisEML"  "$1" "$INSTDIR\chrome\icons\default\misc-file.ico,0" "${AppRegNameMail} Document" "" ""
-
-  ${AddHandlerValues} "$0\BorealisCOMPOSE" "$2" "$8,0" "${AppRegNameMail} URL" "delete" ""
-
-  ; An empty string is used for the 4th & 5th params because the following
-  ; protocol handler already has a display name and additional keys required
-  ; for a protocol handler.
-  ${AddHandlerValues} "$0\mailto" "$2" "$8,0" "${AppRegNameMail} URL" "true" ""
-
-  ; Associate the file handlers with BorealisEML
-  ReadRegStr $6 HKCR ".eml" ""
-  ${If} "$6" != "BorealisEML"
-    WriteRegStr SHCTX "$0\.eml"   "" "BorealisEML"
-  ${EndIf}
-!macroend
-!define SetHandlersMail "!insertmacro SetHandlersMail"
-
-!macro SetHandlersNews
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-  StrCpy $0 "SOFTWARE\Classes"
-  StrCpy $1 "$\"$8$\" -osint -mail $\"%1$\""
-
-  ${AddHandlerValues} "$0\BorealisNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "delete" ""
-  ; An empty string is used for the 4th & 5th params because the following
-  ; protocol handlers already have a display name and additional keys required
-  ; for a protocol handler.
-  ${AddHandlerValues} "$0\news"   "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
-  ${AddHandlerValues} "$0\nntp"   "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
-  ${AddHandlerValues} "$0\snews"  "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
-!macroend
-!define SetHandlersNews "!insertmacro SetHandlersNews"
-
-; XXXrstrong - there are several values that will be overwritten by and
-; overwrite other installs of the same application.
-!macro SetStartMenuInternet
-  GetFullPathName $8 "$INSTDIR\${FileMainEXE}"
-  GetFullPathName $7 "$INSTDIR\uninstall\helper.exe"
-
-  ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
-
-  StrCpy $0 "Software\Clients\StartMenuInternet\$R9"
-  WriteRegStr HKLM "$0" "" "${BrandFullName}"
-
-  WriteRegStr HKLM "$0\DefaultIcon" "" "$8,0"
-
-  ; The Reinstall Command is defined at
-  ; http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/shell_adv/registeringapps.asp
-  WriteRegStr HKLM "$0\InstallInfo" "HideIconsCommand" "$\"$7$\" /HideShortcuts"
-  WriteRegStr HKLM "$0\InstallInfo" "ShowIconsCommand" "$\"$7$\" /ShowShortcuts"
-  WriteRegStr HKLM "$0\InstallInfo" "ReinstallCommand" "$\"$7$\" /SetAsDefaultAppGlobal"
-
-  WriteRegStr HKLM "$0\shell\open\command" "" "$\"$8$\""
-
-  WriteRegStr HKLM "$0\shell\properties" "" "$(CONTEXT_OPTIONS)"
-  WriteRegStr HKLM "$0\shell\properties\command" "" "$\"$8$\" -preferences"
-
-  WriteRegStr HKLM "$0\shell\safemode" "" "$(CONTEXT_SAFE_MODE)"
-  WriteRegStr HKLM "$0\shell\safemode\command" "" "$\"$8$\" -safe-mode"
-
-  ; Vista Capabilities registry keys
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationDescription" "$(REG_APP_DESC)"
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationIcon" "$8,0"
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationName" "${BrandShortName}"
-
-  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".htm"   "BorealisHTML" 
-  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".html"  "BorealisHTML"
-  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".shtml" "BorealisHTML"
-  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".xht"   "BorealisHTML"
-  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".xhtml" "BorealisHTML"
-
-  WriteRegStr HKLM "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
-
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "ftp"    "BorealisURL"
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "http"   "BorealisURL"
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "https"  "BorealisURL"
-
-  ; Vista Registered Application
-  WriteRegStr HKLM "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
-!macroend
-!define SetStartMenuInternet "!insertmacro SetStartMenuInternet"
-
-!macro FixShellIconHandler
-  ; The IconHandler reference for BorealisHTML can end up in an inconsistent
-  ; state due to changes not being detected by the IconHandler for side by side
-  ; installs. The symptoms can be either an incorrect icon or no icon being
-  ; displayed for files associated with Borealis. By setting it here it will
-  ; always reference the install referenced in the
-  ; HKLM\Software\Classes\BorealisHTML registry key.
-  ClearErrors
-  ReadRegStr $2 HKLM "Software\Classes\BorealisHTML\ShellEx\IconHandler" ""
-  ${Unless} ${Errors}
-    ClearErrors
-    ReadRegStr $3 HKLM "Software\Classes\CLSID\$2\Old Icon\BorealisHTML\DefaultIcon" ""
-    ${Unless} ${Errors}
-      WriteRegStr HKLM "Software\Classes\CLSID\$2\Old Icon\BorealisHTML\DefaultIcon" "" "$INSTDIR\chrome\icons\default\html-file.ico,0"
-    ${EndUnless}
-  ${EndUnless}
-!macroend
-!define FixShellIconHandler "!insertmacro FixShellIconHandler"
-
-; XXXrstrong - there are several values that will be overwritten by and
-; overwrite other installs of the same application.
-!macro SetClientsMail
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-  ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7
-  ${GetLongPath} "$INSTDIR\mozMapi32_InUse.dll" $6
-
-  StrCpy $0 "Software\Clients\Mail\${BrandFullNameInternal}"
-  WriteRegStr HKLM "$0" "" "${BrandFullNameInternal}"
-  WriteRegStr HKLM "$0\DefaultIcon" "" "$8,0"
-  WriteRegStr HKLM "$0" "DLLPath" "$6"
-
-  ; The MapiProxy dll can be used by multiple applications but
-  ; is only registered for the last application installed. When the last
-  ; application installed is uninstalled MapiProxy.dll will no longer be
-  ; registered.
-  !ifndef NO_LOG
-    ${LogHeader} "DLL Registration"
-  !endif
-  ClearErrors
-  ${RegisterDLL} "$INSTDIR\MapiProxy_InUse.dll"
-  !ifndef NO_LOG
-    ${If} ${Errors}
-      ${LogMsg} "** ERROR Registering: $INSTDIR\MapiProxy_InUse.dll **"
-    ${Else}
-      ${LogUninstall} "DLLReg: \MapiProxy_InUse.dll"
-      ${LogMsg} "Registered: $INSTDIR\MapiProxy_InUse.dll"
-    ${EndIf}
-  !endif
-
-  StrCpy $1 "Software\Classes\CLSID\{29F458BE-8866-11D5-A3DD-00B0D0F3BAA7}"
-  WriteRegStr HKLM "$1\LocalServer32" "" "$\"$8$\" /MAPIStartup"
-  WriteRegStr HKLM "$1\ProgID" "" "MozillaMapi.1"
-  WriteRegStr HKLM "$1\VersionIndependentProgID" "" "MozillaMAPI"
-  StrCpy $1 "SOFTWARE\Classes"
-  WriteRegStr HKLM "$1\MozillaMapi" "" "Mozilla MAPI"
-  WriteRegStr HKLM "$1\MozillaMapi\CLSID" "" "{29F458BE-8866-11D5-A3DD-00B0D0F3BAA7}"
-  WriteRegStr HKLM "$1\MozillaMapi\CurVer" "" "MozillaMapi.1"
-  WriteRegStr HKLM "$1\MozillaMapi.1" "" "Mozilla MAPI"
-  WriteRegStr HKLM "$1\MozillaMapi.1\CLSID" "" "{29F458BE-8866-11D5-A3DD-00B0D0F3BAA7}"
-
-  ; The Reinstall Command is defined at
-  ; http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/shell_adv/registeringapps.asp
-  WriteRegStr HKLM "$0\InstallInfo" "HideIconsCommand" "$\"$7$\" /HideShortcuts"
-  WriteRegStr HKLM "$0\InstallInfo" "ShowIconsCommand" "$\"$7$\" /ShowShortcuts"
-  WriteRegStr HKLM "$0\InstallInfo" "ReinstallCommand" "$\"$7$\" /SetAsDefaultAppGlobal"
-
-  ClearErrors
-  ReadRegDWORD $1 HKLM "$0\InstallInfo" "IconsVisible"
-  ; If the IconsVisible name value pair doesn't exist add it otherwise the
-  ; application won't be displayed in Set Program Access and Defaults.
-  ${If} ${Errors}
-    ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"
-      WriteRegDWORD HKLM "$0\InstallInfo" "IconsVisible" 1
-    ${Else}
-      WriteRegDWORD HKLM "$0\InstallInfo" "IconsVisible" 0
-    ${EndIf}
-  ${EndIf}
-
-  ; Mail shell/open/command
-  WriteRegStr HKLM "$0\shell\open\command" "" "$\"$8$\" -mail"
-
-  ; options
-  WriteRegStr HKLM "$0\shell\properties" "" "$(CONTEXT_OPTIONS)"
-  WriteRegStr HKLM "$0\shell\properties\command" "" "$\"$8$\" -options"
-
-  ; safemode
-  WriteRegStr HKLM "$0\shell\safemode" "" "$(CONTEXT_SAFE_MODE)"
-  WriteRegStr HKLM "$0\shell\safemode\command" "" "$\"$8$\" -safe-mode"
-
-  ; Protocols
-  StrCpy $1 "$\"$8$\" -compose $\"%1$\""
-  ${AddHandlerValues} "$0\Protocols\mailto" "$1" "$8,0" "${AppRegNameMail} URL" "true" ""
- 
-  ; Vista Capabilities registry keys
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationDescription" "$(REG_APP_DESC)"
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationIcon" "$8,0"
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationName" "${AppRegNameMail}"
-  WriteRegStr HKLM "$0\Capabilities\FileAssociations" ".eml"   "BorealisEML"
-  WriteRegStr HKLM "$0\Capabilities\StartMenu" "Mail" "${BrandFullNameInternal}"
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "mailto" "BorealisCOMPOSE"
-
-  ; Vista Registered Application
-  WriteRegStr HKLM "Software\RegisteredApplications" "${AppRegNameMail}" "$0\Capabilities"
-!macroend
-!define SetClientsMail "!insertmacro SetClientsMail"
-
-; XXXrstrong - there are several values that will be overwritten by and
-; overwrite other installs of the same application.
-!macro SetClientsNews
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-  ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7
-  ${GetLongPath} "$INSTDIR\mozMapi32_InUse.dll" $6
-
-  StrCpy $0 "Software\Clients\News\${BrandFullNameInternal}"
-  WriteRegStr HKLM "$0" "" "${BrandFullNameInternal}"
-  WriteRegStr HKLM "$0\DefaultIcon" "" "$8,0"
-  WriteRegStr HKLM "$0" "DLLPath" "$6"
-
-  ; The MapiProxy dll can exist in multiple installs of the application.
-  ; Registration occurs as follows with the last action to occur being the one
-  ; that wins: On install and software update when helper.exe runs with the
-  ; /PostUpdate argument. On setting the application as the system's default
-  ; application using Window's "Set program access and defaults".
-  !ifndef NO_LOG
-    ${LogHeader} "DLL Registration"
-  !endif
-  ClearErrors
-  ${RegisterDLL} "$INSTDIR\MapiProxy_InUse.dll"
-  !ifndef NO_LOG
-    ${If} ${Errors}
-      ${LogMsg} "** ERROR Registering: $INSTDIR\MapiProxy_InUse.dll **"
-    ${Else}
-      ${LogUninstall} "DLLReg: \MapiProxy_InUse.dll"
-      ${LogMsg} "Registered: $INSTDIR\MapiProxy_InUse.dll"
-    ${EndIf}
-  !endif
-
-  StrCpy $1 "Software\Classes\CLSID\{29F458BE-8866-11D5-A3DD-00B0D0F3BAA7}"
-  WriteRegStr HKLM "$1\LocalServer32" "" "$\"$8$\" /MAPIStartup"
-  WriteRegStr HKLM "$1\ProgID" "" "MozillaMapi.1"
-  WriteRegStr HKLM "$1\VersionIndependentProgID" "" "MozillaMAPI"
-  StrCpy $1 "SOFTWARE\Classes"
-  WriteRegStr HKLM "$1\MozillaMapi" "" "Mozilla MAPI"
-  WriteRegStr HKLM "$1\MozillaMapi\CLSID" "" "{29F458BE-8866-11D5-A3DD-00B0D0F3BAA7}"
-  WriteRegStr HKLM "$1\MozillaMapi\CurVer" "" "MozillaMapi.1"
-  WriteRegStr HKLM "$1\MozillaMapi.1" "" "Mozilla MAPI"
-  WriteRegStr HKLM "$1\MozillaMapi.1\CLSID" "" "{29F458BE-8866-11D5-A3DD-00B0D0F3BAA7}"
-  
-  ; Mail shell/open/command
-  WriteRegStr HKLM "$0\shell\open\command" "" "$\"$8$\" -mail"
-
-  ; Vista Capabilities registry keys
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationDescription" "$(REG_APP_DESC)"
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationIcon" "$8,0"
-  WriteRegStr HKLM "$0\Capabilities" "ApplicationName" "${AppRegNameNews}"
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "nntp" "BorealisNEWS"
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "news" "BorealisNEWS"
-  WriteRegStr HKLM "$0\Capabilities\URLAssociations" "snews" "BorealisNEWS"
-
-  ; Protocols
-  StrCpy $1 "$\"$8$\" -osint -mail $\"%1$\""
-  ${AddHandlerValues} "$0\Protocols\nntp" "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
-  ${AddHandlerValues} "$0\Protocols\news" "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
-  ${AddHandlerValues} "$0\Protocols\snews" "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
-
-  ; Vista Registered Application
-  WriteRegStr HKLM "Software\RegisteredApplications" "${AppRegNameNews}" "$0\Capabilities"
-!macroend
-!define SetClientsNews "!insertmacro SetClientsNews"
-
-!macro SetAppKeys
-  ${GetLongPath} "$INSTDIR" $8
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Main"
-  ${WriteRegStr2} $TmpVal "$0" "Install Directory" "$8" 0
-  ${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0
-
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Uninstall"
-  ${WriteRegStr2} $TmpVal "$0" "Description" "${BrandFullNameInternal} ${AppVersion} (${ARCH} ${AB_CD})" 0
-
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})"
-  ${WriteRegStr2} $TmpVal  "$0" "" "${AppVersion} (${AB_CD})" 0
-
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}\bin"
-  ${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0
-
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}\extensions"
-  ${WriteRegStr2} $TmpVal "$0" "Components" "$8\components" 0
-  ${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0
-
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}"
-  ${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0
-
-  StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}"
-  ${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0
-  ${WriteRegStr2} $TmpVal "$0" "CurrentVersion" "${AppVersion} (${AB_CD})" 0
-!macroend
-!define SetAppKeys "!insertmacro SetAppKeys"
-
-!macro SetUninstallKeys
-  StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} ${AppVersion} (${ARCH} ${AB_CD})"
-
-  WriteRegStr HKLM "$0" "${BrandShortName}InstallerTest" "Write Test"
-  ${If} ${Errors}
-    StrCpy $1 "HKCU"
-    SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-  ${Else}
-    StrCpy $1 "HKLM"
-    SetShellVarContext all     ; Set SHCTX to all users (e.g. HKLM)
-    DeleteRegValue HKLM "$0" "${BrandShortName}InstallerTest"
-  ${EndIf}
-
-  ${GetLongPath} "$INSTDIR" $8
-
-  ; Write the uninstall registry keys
-  ${WriteRegStr2} $1 "$0" "Comments" "${BrandFullNameInternal} ${AppVersion} (${ARCH} ${AB_CD})" 0
-  ${WriteRegStr2} $1 "$0" "DisplayIcon" "$8\${FileMainEXE},0" 0
-  ${WriteRegStr2} $1 "$0" "DisplayName" "${BrandFullNameInternal} ${AppVersion} (${ARCH} ${AB_CD})" 0
-  ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0
-  ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0
-  ${WriteRegStr2} $1 "$0" "Publisher" "Mozilla" 0
-  ${WriteRegStr2} $1 "$0" "UninstallString" "$8\uninstall\helper.exe" 0
-  ${WriteRegStr2} $1 "$0" "URLInfoAbout" "${URLInfoAbout}" 0
-  ${WriteRegStr2} $1 "$0" "URLUpdateInfo" "${URLUpdateInfo}" 0
-  ${WriteRegDWORD2} $1 "$0" "NoModify" 1 0
-  ${WriteRegDWORD2} $1 "$0" "NoRepair" 1 0
-
-  ${GetSize} "$8" "/S=0K" $R2 $R3 $R4
-  ${WriteRegDWORD2} $1 "$0" "EstimatedSize" $R2 0
-
-  ${If} "$TmpVal" == "HKLM"
-    SetShellVarContext all     ; Set SHCTX to all users (e.g. HKLM)
-  ${Else}
-    SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-  ${EndIf}
-!macroend
-!define SetUninstallKeys "!insertmacro SetUninstallKeys"
-
-; Updates protocol handlers if their registry open command value is for this
-; install location
-!macro UpdateProtocolHandlers
-  ; Store the command to open the app with an url in a register for easy access.
-  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
-  StrCpy $0 "SOFTWARE\Classes"
-  StrCpy $1 "$\"$8$\" -osint -compose $\"%1$\""
-  StrCpy $2 "$\"$8$\" -osint -mail $\"%1$\""
-  StrCpy $3 "$\"$8$\" -requestPending -osint -url $\"%1$\""
-  StrCpy $4 "$\"%1$\",,0,0,,,,"
-  StrCpy $5 "$\"$8$\" -url $\"%1$\""
-
-  ; Only set the file and protocol handlers if the existing one under HKCR is
-  ; for this install location.
-  ${IsHandlerForInstallDir} "BorealisHTML" $R9
-  ${If} "$R9" == "true"
-    ; An empty string is used for the 5th param because BorealisHTML is not a
-    ; protocol handler.
-    ${AddHandlerValues} "$0\BorealisHTML" "$5" \
-                        "$INSTDIR\chrome\icons\default\html-file.ico,0" \
-                        "${AppRegName} Document" "" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "BorealisURL" $R9
-  ${If} "$R9" == "true"
-    ${AddDDEHandlerValues} "BorealisURL" "$3" "$8,0" "${AppRegName} URL" \
-                           "delete" "${DDEApplication}" "$4" "WWW_OpenURL"
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "ftp" $R9
-  ${If} "$R9" == "true"
-    ${AddDDEHandlerValues} "ftp" "$3" "$8,0" "" "" "${DDEApplication}" \
-                           "$4" "WWW_OpenURL"
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "http" $R9
-  ${If} "$R9" == "true"
-    ${AddDDEHandlerValues} "http" "$3" "$8,0" "" "" "${DDEApplication}" \
-                           "$4" "WWW_OpenURL"
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "https" $R9
-  ${If} "$R9" == "true"
-    ${AddDDEHandlerValues} "https" "$3" "$8,0" "" "" "${DDEApplication}" \
-                           "$4" "WWW_OpenURL"
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "BorealisEML" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\BorealisEML" "$2" \
-                        "$INSTDIR\chrome\icons\default\misc-file.ico,0" \
-                        "${AppRegNameMail} Document" "" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "BorealisMAIL" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\BorealisMAIL" "$2" "$8,0" \
-                        "${AppRegNameMail} URL" "delete" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "mailto" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\mailto" "$1" "$8,0" "" "" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "BorealisNEWS" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\BorealisNEWS" "$2" "$8,0" \
-                        "${AppRegNameMail} URL" "delete" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "news" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\news" "$2" "$8,0" "" "" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "snews" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\snews" "$2" "$8,0" "" "" ""
-  ${EndIf}
-
-  ${IsHandlerForInstallDir} "nntp" $R9
-  ${If} "$R9" == "true"
-    ${AddHandlerValues} "SOFTWARE\Classes\nntp" "$2" "$8,0" "" "" ""
-  ${EndIf}
-!macroend
-!define UpdateProtocolHandlers "!insertmacro UpdateProtocolHandlers"
-!insertmacro RegCleanAppHandler
-
-; Removes various registry entries for reasons noted below (does not use SHCTX).
-!macro RemoveDeprecatedKeys
-  StrCpy $0 "SOFTWARE\Classes"
-  ; Remove support for launching gopher urls from the shell during install or
-  ; update if the DefaultIcon is from Borealis.exe.
-  ${RegCleanAppHandler} "gopher"
-  
-  ; Remove support for launching chrome urls from the shell during install or
-  ; update if the DefaultIcon is from Borealis.exe (Bug 301073).
-  ${RegCleanAppHandler} "chrome"
-  
-  ; Delete gopher from Capabilities\URLAssociations if it is present.
-  ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
-  StrCpy $0 "Software\Clients\StartMenuInternet\$R9"
-  ClearErrors
-  ReadRegStr $2 HKLM "$0\Capabilities\URLAssociations" "gopher"
-  ${Unless} ${Errors}
-    DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher"
-  ${EndUnless}
-
-  ; Delete gopher from the user's UrlAssociations if it points to BorealisURL.
-  StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
-  ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
-  ${If} "$2" == "BorealisURL"
-    DeleteRegKey HKCU "$0"
-  ${EndIf}
-!macroend
-!define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys"
-
-!macro FixClassKeys
-  StrCpy $0 "SOFTWARE\Classes"
-
-  ; BROWSER part
-  ; File handler keys and name value pairs that may need to be created during
-  ; install or upgrade.
-  ReadRegStr $2 SHCTX "$0\.shtml" "Content Type"
-  ${If} $2 == ""
-    StrCpy $2 "$0\.shtml"
-    ${WriteRegStr2} $TmpVal "$0\.shtml" "" "shtmlfile" 0
-    ${WriteRegStr2} $TmpVal "$0\.shtml" "Content Type" "text/html" 0
-    ${WriteRegStr2} $TmpVal "$0\.shtml" "PerceivedType" "text" 0
-  ${EndIf}
-
-  ReadRegStr $2 SHCTX "$0\.xht" "Content Type"
-  ${If} $2 == ""
-    ${WriteRegStr2} $TmpVal "$0\.xht" "" "xhtfile" 0
-    ${WriteRegStr2} $TmpVal "$0\.xht" "Content Type" "application/xhtml+xml" 0
-  ${EndIf}
-
-  ReadRegStr $2 SHCTX "$0\.xhtml" "Content Type"
-  ${If} $2 == ""
-    ${WriteRegStr2} $TmpVal "$0\.xhtml" "" "xhtmlfile" 0
-    ${WriteRegStr2} $TmpVal "$0\.xhtml" "Content Type" "application/xhtml+xml" 0
-  ${EndIf}
-
-  ; Protocol handler keys and name value pairs that may need to be updated during
-  ; install or upgrade.
-
-  ; Store the command to open the app with an url in a register for easy access.
-  GetFullPathName $8 "$INSTDIR\${FileMainEXE}"
-  StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
-  StrCpy $2 "$\"$8$\" -url $\"%1$\""
-
-  ; Always set the file and protocol handlers since they may specify a
-  ; different path and the path is used by Vista when setting associations.
-  ${AddHandlerValues} "$0\BorealisURL" "$1" "$8,0" "${AppRegName} URL" "delete" "true"
-
-  ; An empty string is used for the 5th param because BorealisHTML is not a
-  ; protocol handler
-  ${AddHandlerValues} "$0\BorealisHTML" "$2" \
-                      "$INSTDIR\chrome\icons\default\html-file.ico,0" \
-                      "${AppRegName} Document" "" ""
-
-  ReadRegStr $2 SHCTX "$0\http\shell\open\command" ""
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    ${AddHandlerValues} "$0\http" "$1" "$8,0" "" "" "true"
-  ${EndUnless}
-
-  ReadRegStr $2 SHCTX "$0\https\shell\open\command" ""
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    ${AddHandlerValues} "$0\https" "$1" "$8,0" "" "" "true"
-  ${EndUnless}
-
-  ReadRegStr $2 SHCTX "$0\ftp\shell\open\command" ""
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    ${AddHandlerValues} "$0\ftp" "$1" "$8,0" "" "" "true"
-  ${EndUnless}
-
-  ; MAIL/NEWS part
-  GetFullPathName $8 "$INSTDIR\${FileMainEXE}"
-
-  StrCpy $1 "$\"$8$\" -compose $\"%1$\""
-  ${AddHandlerValues} "$0\BorealisCOMPOSE" "$1" "$8,0" "${AppRegNameMail} URL" "delete" ""
-
-  ReadRegStr $2 SHCTX "$0\mailto\shell\open\command" ""
-  ${GetPathFromString} "$2" $3
-  GetFullPathName $2 "$3"
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-   ${AddHandlerValues} "$0\mailto" "$1" "$8,0" "" "" ""
-  ${EndUnless}
-
-  StrCpy $1 "$\"$8$\" $\"%1$\""
-  ${AddHandlerValues} "$0\BorealisEML" "$1" "$INSTDIR\chrome\icons\default\misc-file.ico,0" "${AppRegNameMail} Document" "" ""
-
-  StrCpy $1 "$\"$8$\" -osint -mail $\"%1$\""
-  ${AddHandlerValues} "$0\BorealisNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "delete" ""
-
-  ReadRegStr $2 SHCTX "$0\news\shell\open\command" ""
-  ${GetPathFromString} "$2" $3
-  GetFullPathName $2 "$3"
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    ${AddHandlerValues} "$0\news" "$1" "$8,0" "" "" ""
-  ${EndUnless}
-
-  ReadRegStr $2 SHCTX "$0\snews\shell\open\command" ""
-  ${GetPathFromString} "$2" $3
-  GetFullPathName $2 "$3"
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    ${AddHandlerValues} "$0\snews" "$1" "$8,0" "" "" ""
-  ${EndUnless}
-
-  ReadRegStr $2 SHCTX "$0\nntp\shell\open\command" ""
-  ${GetPathFromString} "$2" $3
-  GetFullPathName $2 "$3"
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    ${AddHandlerValues} "$0\nntp" "$1" "$8,0" "" "" ""
-  ${EndUnless}
-
-  ; remove DI and SOC from the .eml class if it exists
-  ReadRegStr $2 SHCTX "$0\.eml\shell\open\command" ""
-  ${GetPathFromString} "$2" $3
-  GetFullPathName $2 "$3"
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    DeleteRegKey HKLM "$0\.eml\shell\open\command"
-  ${EndUnless}
-
-  ReadRegStr $2 SHCTX "$0\.eml\DefaultIcon" ""
-  ${GetPathFromString} "$2" $3
-  GetFullPathName $2 "$3"
-  ClearErrors
-  ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
-  ${Unless} ${Errors}
-    DeleteRegKey HKLM "$0\.eml\DefaultIcon"
-  ${EndUnless}
-
-!macroend
-!define FixClassKeys "!insertmacro FixClassKeys"
-
-; Creates the shortcuts log ini file with the appropriate entries if it doesn't
-; already exist.
-!macro CreateShortcutsLog
-  ${GetShortcutsLogPath} $0
-  ${Unless} ${FileExists} "$0"
-    ; Default to ${BrandFullName} for the Start Menu Folder
-    StrCpy $TmpVal "${BrandFullName}"
-    ; Prior to Unicode installer the Start Menu directory was written to the
-    ; registry and this value can be used to set the Start Menu directory.
-    ClearErrors
-    ReadRegStr $0 SHCTX "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Main" "Start Menu Folder"
-    ${If} ${Errors}
-      ${FindSMProgramsDir} $0
-      ${If} "$0" != ""
-        StrCpy $TmpVal "$0"
-      ${EndIf}
-    ${Else}
-      StrCpy $TmpVal "$0"
-    ${EndUnless}
-
-    ${LogSMProgramsDirRelPath} "$TmpVal"
-    ${LogSMProgramsShortcut} "${BrandFullName}.lnk"
-    ${LogSMProgramsShortcut} "${BrandFullName} ($(SAFE_MODE)).lnk"
-    ${LogSMProgramsShortcut} "${BrandFullNameInternal} $(MAILNEWS_TEXT).lnk"
-    ${LogSMProgramsShortcut} "$(PROFILE_TEXT).lnk"
-    ${LogQuickLaunchShortcut} "${BrandFullName}.lnk"
-    ${LogDesktopShortcut} "${BrandFullName}.lnk"
-  ${EndUnless}
-!macroend
-!define CreateShortcutsLog "!insertmacro CreateShortcutsLog"
-
-; The MAPI DLLs are copied and the copies are used for the MAPI registration
-; to lessen file in use errors on application update.
-!macro UpgradeMapiDLLs
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\MapiProxy_InUse.dll"
-  ${If} ${Errors}
-    ${DeleteFile} "$INSTDIR\MapiProxy_InUse.dll.moz-delete" ; shouldn't exist
-    Rename "$INSTDIR\MapiProxy_InUse.dll" "$INSTDIR\MapiProxy_InUse.dll.moz-delete"
-    Delete /REBOOTOK "$INSTDIR\MapiProxy_InUse.dll.moz-delete"
-  ${EndIf}
-  CopyFiles /SILENT "$INSTDIR\MapiProxy.dll" "$INSTDIR\MapiProxy_InUse.dll"
-
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\mozMapi32_InUse.dll"
-  ${If} ${Errors}
-    ${DeleteFile} "$INSTDIR\mozMapi32_InUse.dll.moz-delete" ; shouldn't exist
-    Rename "$INSTDIR\mozMapi32_InUse.dll" "$INSTDIR\mozMapi32_InUse.dll.moz-delete"
-    Delete /REBOOTOK "$INSTDIR\mozMapi32_InUse.dll.moz-delete"
-  ${EndIf}
-  CopyFiles /SILENT "$INSTDIR\mozMapi32.dll" "$INSTDIR\mozMapi32_InUse.dll"
-!macroend
-!define UpgradeMapiDLLs "!insertmacro UpgradeMapiDLLs"
-
-; The files to check if they are in use during (un)install so the restart is
-; required message is displayed. All files must be located in the $INSTDIR
-; directory.
-!macro PushFilesToCheck
-  ; The first string to be pushed onto the stack MUST be "end" to indicate
-  ; that there are no more files to check in $INSTDIR and the last string
-  ; should be ${FileMainEXE} so if it is in use the CheckForFilesInUse macro
-  ; returns after the first check.
-  Push "end"
-  Push "AccessibleMarshal.dll"
-  Push "freebl3.dll"
-  Push "nssckbi.dll"
-  Push "nspr4.dll"
-  Push "nssdbm3.dll"
-  Push "sqlite3.dll"
-  Push "mozsqlite3.dll"
-  Push "xpcom.dll"
-  Push "crashreporter.exe"
-  Push "updater.exe"
-  Push "xpicleanup.exe"
-  Push "MapiProxy.dll"
-  Push "MapiProxy_InUse.dll"
-  Push "mozMapi32.dll"
-  Push "mozMapi32_InUse.dll"
-  Push "${FileMainEXE}"
-!macroend
-!define PushFilesToCheck "!insertmacro PushFilesToCheck"
-
-; The !ifdef NO_LOG prevents warnings when compiling the installer since these
-; functions are currently only used by the uninstaller.
-!ifdef NO_LOG
-Function SetAsDefaultMailAppUser
-  SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-  ${SetHandlersMail}
-  ${If} ${AtLeastWinVista}
-    ClearErrors
-    ReadRegStr $0 HKLM "Software\RegisteredApplications" "${AppRegNameMail}"
-    ; Only register as the handler on Vista if the app registry name exists
-    ; under the RegisteredApplications registry key.
-    ${Unless} ${Errors}
-      AppAssocReg::SetAppAsDefaultAll "${AppRegNameMail}"
-    ${EndUnless}
-  ${EndIf}
-FunctionEnd
-
-Function SetAsDefaultNewsAppUser
-  SetShellVarContext current  ; Set SHCTX to the current user (e.g. HKCU)
-  ${SetHandlersNews}
-  ${If} ${AtLeastWinVista}
-    ClearErrors
-    ReadRegStr $0 HKLM "Software\RegisteredApplications" "${AppRegNameNews}"
-    ; Only register as the handler on Vista if the app registry name exists
-    ; under the RegisteredApplications registry key.
-    ${Unless} ${Errors}
-      AppAssocReg::SetAppAsDefaultAll "${AppRegNameNews}"
-    ${EndUnless}
-  ${EndIf}
-FunctionEnd
-!endif
-
diff --git a/navigator/installer/windows/nsis/uninstaller.nsi b/navigator/installer/windows/nsis/uninstaller.nsi
deleted file mode 100644
index f174974c..00000000
--- a/navigator/installer/windows/nsis/uninstaller.nsi
+++ /dev/null
@@ -1,573 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Also requires:
-# AppAssocReg http://nsis.sourceforge.net/Application_Association_Registration_plug-in
-# CityHash    http://mxr.mozilla.org/mozilla-central/source/other-licenses/nsis/Contrib/CityHash
-# ShellLink   http://nsis.sourceforge.net/ShellLink_plug-in
-# UAC         http://nsis.sourceforge.net/UAC_plug-in
-
-
-; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs
-!verbose 3
-
-; 7-Zip provides better compression than the lzma from NSIS so we add the files
-; uncompressed and use 7-Zip to create a SFX archive of it
-SetDatablockOptimize on
-SetCompress off
-CRCCheck on
-
-RequestExecutionLevel user
-
-; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
-; be removed after we require NSIS 3.0a2 or greater.
-!ifdef NSIS_PACKEDVERSION
-  Unicode true
-  ManifestSupportedOS all
-  ManifestDPIAware true
-!endif
-
-!addplugindir ./
-
-; prevents compiling of the reg write logging.
-!define NO_LOG
-
-Var TmpVal
-
-; Other included files may depend upon these includes!
-; The following includes are provided by NSIS.
-!include FileFunc.nsh
-!include LogicLib.nsh
-!include MUI.nsh
-!include WinMessages.nsh
-!include WinVer.nsh
-!include WordFunc.nsh
-
-!insertmacro GetSize
-!insertmacro GetOptions
-!insertmacro GetParameters
-!insertmacro GetParent
-!insertmacro StrFilter
-!insertmacro WordFind
-
-!insertmacro un.GetParent
-
-; The following includes are custom.
-!include branding.nsi
-!include defines.nsi
-!include common.nsh
-!include locales.nsi
-
-; This is named BrandShortName helper because we use this for software update
-; post update cleanup.
-VIAddVersionKey "FileDescription" "${BrandShortName} Helper"
-VIAddVersionKey "OriginalFilename" "helper.exe"
-
-; Most commonly used macros for managing shortcuts
-!insertmacro _LoggingShortcutsCommon
-
-!insertmacro AddDDEHandlerValues
-!insertmacro AddHandlerValues
-!insertmacro CheckIfRegistryKeyExists
-!insertmacro CleanUpdateDirectories
-!insertmacro CleanVirtualStore
-!insertmacro FindSMProgramsDir
-!insertmacro GetLongPath
-!insertmacro GetPathFromString
-!insertmacro InitHashAppModelId
-!insertmacro IsHandlerForInstallDir
-!insertmacro RegCleanMain
-!insertmacro RegCleanUninstall
-!insertmacro SetBrandNameVars
-!insertmacro UnloadUAC
-!insertmacro UpdateShortcutAppModelIDs
-!insertmacro WordReplace
-!insertmacro WriteRegDWORD2
-!insertmacro WriteRegStr2
-
-!insertmacro un.ChangeMUIHeaderImage
-!insertmacro un.CheckForFilesInUse
-!insertmacro un.CleanUpdateDirectories
-!insertmacro un.CleanVirtualStore
-!insertmacro un.DeleteShortcuts
-!insertmacro un.GetLongPath
-!insertmacro un.GetSecondInstallPath
-!insertmacro un.InitHashAppModelId
-!insertmacro un.ManualCloseAppPrompt
-!insertmacro un.ParseUninstallLog
-!insertmacro un.RegCleanAppHandler
-!insertmacro un.RegCleanFileHandler
-!insertmacro un.RegCleanMain
-!insertmacro un.RegCleanProtocolHandler
-!insertmacro un.RegCleanUninstall
-!insertmacro un.RemoveQuotesFromPath
-!insertmacro un.SetBrandNameVars
-
-!include shared.nsh
-
-; Helper macros for ui callbacks. Insert these after shared.nsh
-!insertmacro OnEndCommon
-!insertmacro UninstallOnInitCommon
-
-!insertmacro un.OnEndCommon
-!insertmacro un.UninstallUnOnInitCommon
-
-Name "${BrandFullName}"
-OutFile "helper.exe"
-!ifdef HAVE_64BIT_BUILD
-  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
-!else
-  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
-!endif
-ShowUnInstDetails nevershow
-
-################################################################################
-# Modern User Interface - MUI
-
-!define MUI_ABORTWARNING
-!define MUI_ICON setup.ico
-!define MUI_UNICON setup.ico
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_RIGHT
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP wizWatermark.bmp
-
-; Use a right to left header image when the language is right to left
-!ifdef ${AB_CD}_rtl
-!define MUI_HEADERIMAGE_BITMAP_RTL wizHeaderRTL.bmp
-!else
-!define MUI_HEADERIMAGE_BITMAP wizHeader.bmp
-!endif
-
-/**
- * Uninstall Pages
- */
-; Welcome Page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preWelcome
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.leaveWelcome
-!insertmacro MUI_UNPAGE_WELCOME
-
-; Uninstall Confirm Page
-UninstPage custom un.preConfirm un.leaveConfirm
-
-; Remove Files Page
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Don't setup the survey controls, functions, etc. when the application has
-; defined NO_UNINSTALL_SURVEY
-!ifndef NO_UNINSTALL_SURVEY
-!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preFinish
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME ""
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(SURVEY_TEXT)
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.Survey
-!endif
-
-!insertmacro MUI_UNPAGE_FINISH
-
-; Use the default dialog for IDD_VERIFY for a simple Banner
-ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe"
-
-################################################################################
-# Install Sections
-; Empty section required for the installer to compile as an uninstaller
-Section ""
-SectionEnd
-
-################################################################################
-# Uninstall Sections
-
-Section "Uninstall"
-  SetDetailsPrint textonly
-  DetailPrint $(STATUS_UNINSTALL_MAIN)
-  SetDetailsPrint none
-
-  ; Delete the app exe to prevent launching the app while we are uninstalling.
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-  ${If} ${Errors}
-    ; If the user closed the application it can take several seconds for it to
-    ; shut down completely. If the application is being used by another user we
-    ; can still delete the files when the system is restarted.
-    Sleep 5000
-    ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-    ClearErrors
-  ${EndIf}
-
-  SetShellVarContext current  ; Set SHCTX to HKCU
-  ${un.RegCleanMain} "Software\Mozilla"
-  ${un.RegCleanUninstall}
-  ${un.DeleteShortcuts}
-
-  ; setup the application model id registration value
-  ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
-
-  ; Unregister resources associated with Win7 taskbar jump lists.
-  ${If} ${AtLeastWin7}
-  ${AndIf} "$AppUserModelID" != ""
-    ApplicationID::UninstallJumpLists "$AppUserModelID"
-  ${EndIf}
-
-  ; Remove the updates directory for Vista and above
-  ${un.CleanUpdateDirectories} "Mozilla\Borealis" "Mozilla\updates"
-
-  ; Remove any app model id's stored in the registry for this install path
-  DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
-  DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
-
-  ClearErrors
-  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
-  ${If} ${Errors}
-    StrCpy $TmpVal "HKCU" ; used primarily for logging
-  ${Else}
-    SetShellVarContext all  ; Set SHCTX to HKLM
-    DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
-    StrCpy $TmpVal "HKLM" ; used primarily for logging
-    ${un.RegCleanMain} "Software\Mozilla"
-    ${un.RegCleanUninstall}
-    ${un.DeleteShortcuts}
-  ${EndIf}
-
-  ${un.RegCleanAppHandler} "BorealisURL"
-  ${un.RegCleanAppHandler} "BorealisHTML"
-  ${un.RegCleanAppHandler} "BorealisMAIL"
-  ${un.RegCleanAppHandler} "BorealisNEWS"
-  ${un.RegCleanAppHandler} "BorealisEML"
-  ${un.RegCleanProtocolHandler} "http"
-  ${un.RegCleanProtocolHandler} "https"
-  ${un.RegCleanProtocolHandler} "ftp"
-  ${un.RegCleanProtocolHandler} "mailto"
-  ${un.RegCleanProtocolHandler} "news"
-  ${un.RegCleanProtocolHandler} "nntp"
-  ${un.RegCleanProtocolHandler} "snews"
-
-  ClearErrors
-  ReadRegStr $R9 HKCR "BorealisEML" ""
-  ; Don't clean up the file handlers if the BorealisEML key still exists since
-  ; there could be a second installation that may be the default file handler
-  ${If} ${Errors}
-    ${un.RegCleanFileHandler}  ".eml"   "BorealisEML"
-  ${EndIf}
-
-  ClearErrors
-  ReadRegStr $R9 HKCR "BorealisHTML" ""
-  ; Don't clean up the file handlers if the BorealisHTML key still exists since
-  ; there could be a second installation that may be the default file handler
-  ${If} ${Errors}
-    ${un.RegCleanFileHandler}  ".htm"   "BorealisHTML"
-    ${un.RegCleanFileHandler}  ".html"  "BorealisHTML"
-    ${un.RegCleanFileHandler}  ".shtml" "BorealisHTML"
-    ${un.RegCleanFileHandler}  ".webm"  "BorealisHTML"
-    ${un.RegCleanFileHandler}  ".xht"   "BorealisHTML"
-    ${un.RegCleanFileHandler}  ".xhtml" "BorealisHTML"
-  ${EndIf}
-
-  SetShellVarContext all  ; Set SHCTX to HKLM
-  ${un.GetSecondInstallPath} "Software\Mozilla" $R9
-  ${If} $R9 == "false"
-    SetShellVarContext current  ; Set SHCTX to HKCU
-    ${un.GetSecondInstallPath} "Software\Mozilla" $R9
-  ${EndIf}
-
-  StrCpy $0 "Software\Clients\StartMenuInternet\${FileMainEXE}\shell\open\command"
-  ReadRegStr $R1 HKLM "$0" ""
-  ${un.RemoveQuotesFromPath} "$R1" $R1
-  ${un.GetParent} "$R1" $R1
-
-  ; Only remove the StartMenuInternet key if it refers to this install location.
-  ; The StartMenuInternet registry key is independent of the default browser
-  ; settings. The XPInstall base un-installer always removes this key if it is
-  ; uninstalling the default browser and it will always replace the keys when
-  ; installing even if there is another install of Borealis that is set as the
-  ; default browser. Now the key is always updated on install but it is only
-  ; removed if it refers to this install location.
-  ${If} "$INSTDIR" == "$R1"
-    DeleteRegKey HKLM "Software\Clients\StartMenuInternet\${FileMainEXE}"
-    DeleteRegValue HKLM "Software\RegisteredApplications" "${AppRegName}"
-  ${EndIf}
-
-  StrCpy $0 "Software\Clients\Mail\${BrandFullNameInternal}\shell\open\command"
-  ReadRegStr $R1 HKLM "$0" ""
-  ${un.RemoveQuotesFromPath} "$R1" $R1
-  ${un.GetParent} "$R1" $R1
-
-  ; Only remove the Clients\Mail and Clients\News key if it refers to this
-  ; install location. The Clients\Mail & Clients\News keys are independent
-  ; of the default app for the OS settings. The XPInstall base un-installer
-  ; always removes these keys if it is uninstalling the default app and it
-  ; will always replace the keys when installing even if there is another
-  ; install of Borealis that is set as the default app. Now the keys are always
-  ; updated on install but are only removed if they refer to this install
-  ; location.
-  ${If} "$INSTDIR" == "$R1"
-    DeleteRegKey HKLM "Software\Clients\Mail\${BrandFullNameInternal}"
-    DeleteRegKey HKLM "Software\Clients\News\${BrandFullNameInternal}"
-    DeleteRegValue HKLM "Software\RegisteredApplications" "${AppRegNameMail}"
-    DeleteRegValue HKLM "Software\RegisteredApplications" "${AppRegNameNews}"
-  ${EndIf}
-
-  StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}"
-  ${If} $R9 == "false"
-    DeleteRegKey HKLM "$0"
-    DeleteRegKey HKCU "$0"
-    StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\${FileMainEXE}"
-    DeleteRegKey HKLM "$0"
-    DeleteRegKey HKCU "$0"
-    StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
-    DeleteRegKey HKLM "$0"
-    DeleteRegKey HKCU "$0"
-  ${Else}
-    ReadRegStr $R1 HKLM "$0" ""
-    ${un.RemoveQuotesFromPath} "$R1" $R1
-    ${un.GetParent} "$R1" $R1
-    ${If} "$INSTDIR" == "$R1"
-      WriteRegStr HKLM "$0" "" "$R9"
-      ${un.GetParent} "$R9" $R1
-      WriteRegStr HKLM "$0" "Path" "$R1"
-    ${EndIf}
-  ${EndIf}
-
-  ; Remove directories and files we always control before parsing the uninstall
-  ; log so empty directories can be removed.
-  ${If} ${FileExists} "$INSTDIR\updates"
-    RmDir /r /REBOOTOK "$INSTDIR\updates"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\defaults\shortcuts"
-    RmDir /r /REBOOTOK "$INSTDIR\defaults\shortcuts"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\distribution"
-    RmDir /r /REBOOTOK "$INSTDIR\distribution"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\removed-files"
-    Delete /REBOOTOK "$INSTDIR\removed-files"
-  ${EndIf}
-
-  ; Application update won't add these files to the uninstall log so delete
-  ; them if they still exist.
-  ${If} ${FileExists} "$INSTDIR\MapiProxy_InUse.dll"
-    Delete /REBOOTOK "$INSTDIR\MapiProxy_InUse.dll"
-  ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\mozMapi32_InUse.dll"
-    Delete /REBOOTOK "$INSTDIR\mozMapi32_InUse.dll"
-  ${EndIf}
-
-  ; Remove files that may be left behind by the application in the
-  ; VirtualStore directory.
-  ${un.CleanVirtualStore}
-
-  ; Parse the uninstall log to unregister dll's and remove all installed
-  ; files / directories this install is responsible for.
-  ${un.ParseUninstallLog}
-
-  ; Remove the uninstall directory that we control
-  RmDir /r /REBOOTOK "$INSTDIR\uninstall"
-
-  ; Remove the installation directory if it is empty
-  ${RemoveDir} "$INSTDIR"
-
-  ; If Borealis.exe was successfully deleted yet we still need to restart to
-  ; remove other files create a dummy Borealis.exe.moz-delete to prevent the
-  ; installer from allowing an install without restart when it is required
-  ; to complete an uninstall.
-  ${If} ${RebootFlag}
-    ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-delete"
-      FileOpen $0 "$INSTDIR\${FileMainEXE}.moz-delete" w
-      FileWrite $0 "Will be deleted on restart"
-      Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete"
-      FileClose $0
-    ${EndUnless}
-  ${EndIf}
-
-
-  ; Refresh desktop icons otherwise the start menu internet item won't be
-  ; removed and other ugly things will happen like recreation of the app's
-  ; clients registry key by the OS under some conditions.
-  System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
-SectionEnd
-
-################################################################################
-# Helper Functions
-
-; Don't setup the survey controls, functions, etc. when the application has
-; defined NO_UNINSTALL_SURVEY
-!ifndef NO_UNINSTALL_SURVEY
-Function un.Survey
-  Exec "$\"$TmpVal$\" $\"${SurveyURL}$\""
-FunctionEnd
-!endif
-
-################################################################################
-# Language
-
-!insertmacro MOZ_MUI_LANGUAGE 'baseLocale'
-!verbose push
-!verbose 3
-!include "overrideLocale.nsh"
-!include "customLocale.nsh"
-!verbose pop
-
-; Set this after the locale files to override it if it is in the locale. Using
-; " " for BrandingText will hide the "Nullsoft Install System..." branding.
-BrandingText " "
-
-################################################################################
-# Page pre, show, and leave functions
-
-Function un.preWelcome
-  ${If} ${FileExists} "$INSTDIR\distribution\modern-wizard.bmp"
-    Delete "$PLUGINSDIR\modern-wizard.bmp"
-    CopyFiles /SILENT "$INSTDIR\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp"
-  ${EndIf}
-FunctionEnd
-
-Function un.leaveWelcome
-  ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
-    Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)"
-
-    ${If} "$TmpVal" == "FoundMessageWindow"
-      Sleep 5000
-    ${EndIf}
-
-    ${PushFilesToCheck}
-
-    ${un.CheckForFilesInUse} $TmpVal
-
-    Banner::destroy
-
-    ${If} "$TmpVal" == "true"
-      StrCpy $TmpVal "FoundMessageWindow"
-      ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)"
-      StrCpy $TmpVal "true"
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
-
-Function un.preConfirm
-  ${If} ${FileExists} "$INSTDIR\distribution\modern-header.bmp"
-  ${AndIf} $hHeaderBitmap == ""
-    Delete "$PLUGINSDIR\modern-header.bmp"
-    CopyFiles /SILENT "$INSTDIR\distribution\modern-header.bmp" "$PLUGINSDIR\modern-header.bmp"
-    ${un.ChangeMUIHeaderImage} "$PLUGINSDIR\modern-header.bmp"
-  ${EndIf}
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "3"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Text   "$(UN_CONFIRM_UNINSTALLED_FROM)"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Bottom "15"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Type   "text"
-  ; The contents of this control must be set as follows in the pre function
-  ; ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND"
-  ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" State  ""
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Top    "17"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Bottom "30"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" flags  "READONLY"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Type   "label"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Text   "$(UN_CONFIRM_CLICK)"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Top    "130"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Bottom "150"
-
-  ${If} "$TmpVal" == "true"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Type   "label"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Text   "$(SUMMARY_REBOOT_REQUIRED_UNINSTALL)"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Left   "0"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Top    "35"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Bottom "45"
-
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "4"
-  ${EndIf}
-
-  !insertmacro MUI_HEADER_TEXT "$(UN_CONFIRM_PAGE_TITLE)" "$(UN_CONFIRM_PAGE_SUBTITLE)"
-  ; The Summary custom page has a textbox that will automatically receive
-  ; focus. This sets the focus to the Install button instead.
-  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "unconfirm.ini"
-  GetDlgItem $0 $HWNDPARENT 1
-  System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i"
-  ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND"
-  SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-FunctionEnd
-
-Function un.leaveConfirm
-  ; Try to delete the app executable and if we can't delete it try to find the
-  ; app's message window and prompt the user to close the app. This allows
-  ; running an instance that is located in another directory. If for whatever
-  ; reason there is no message window we will just rename the app's files and
-  ; then remove them on restart if they are in use.
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-  ${If} ${Errors}
-    ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)"
-  ${EndIf}
-FunctionEnd
-
-!ifndef NO_UNINSTALL_SURVEY
-Function un.preFinish
-  ; Do not modify the finish page if there is a reboot pending
-  ${Unless} ${RebootFlag}
-    ; Setup the survey controls, functions, etc.
-    StrCpy $TmpVal "SOFTWARE\Microsoft\IE Setup\Setup"
-    ClearErrors
-    ReadRegStr $0 HKLM $TmpVal "Path"
-    ${If} ${Errors}
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
-    ${Else}
-      ExpandEnvStrings $0 "$0" ; this value will usually contain %programfiles%
-      ${If} $0 != "\"
-        StrCpy $0 "$0\"
-      ${EndIf}
-      StrCpy $0 "$0\iexplore.exe"
-      ClearErrors
-      GetFullPathName $TmpVal $0
-      ${If} ${Errors}
-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
-      ${Else}
-        ; When we add an optional action to the finish page the cancel button
-        ; is enabled. This disables it and leaves the finish button as the
-        ; only choice.
-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0"
-      ${EndIf}
-    ${EndIf}
-  ${EndUnless}
-FunctionEnd
-!endif
-
-################################################################################
-# Initialization Functions
-
-Function .onInit
-  ; We need this set up for most of the helper.exe operations.
-  !ifdef AppName
-  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
-  !endif
-  ${UninstallOnInitCommon}
-FunctionEnd
-
-Function un.onInit
-  StrCpy $LANGUAGE 0
-
-  ${un.UninstallUnOnInitCommon}
-
-  !insertmacro InitInstallOptionsFile "unconfirm.ini"
-FunctionEnd
-
-Function .onGUIEnd
-  ${OnEndCommon}
-FunctionEnd
-
-Function un.onGUIEnd
-  ${un.OnEndCommon}
-FunctionEnd
-
diff --git a/navigator/installer/windows/nsis/updater_append.ini b/navigator/installer/windows/nsis/updater_append.ini
deleted file mode 100644
index 1b4bc1be..00000000
--- a/navigator/installer/windows/nsis/updater_append.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-; IMPORTANT: This file should always start with a newline in case a locale
-; provided updater.ini does not end with a newline.
-; Application to launch after an update has been successfully applied. This
-; must be in the same directory or a sub-directory of the directory of the
-; application executable that initiated the software update.
-[PostUpdateWin]
-; ExeRelPath is the path to the PostUpdateWin executable relative to the
-; application executable.
-ExeRelPath=uninstall\helper.exe
-; ExeArg is the argument to pass to the PostUpdateWin exe
-ExeArg=/PostUpdate
diff --git a/navigator/moz.build b/navigator/moz.build
index a8e7408f..256fc4a1 100644
--- a/navigator/moz.build
+++ b/navigator/moz.build
@@ -13,8 +13,8 @@ DIRS += [
     'themes',
 ]
 
-if CONFIG['MAKENSISU']:
-    DIRS += ['installer/windows']
+#if CONFIG['MAKENSISU']:
+#    DIRS += ['installer/windows']
 
 # app is always last as it packages up the built files on mac.
 DIRS += ['app']