Bug 1290756 - Remove Help Viewer from Toolkit. r=gps
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 31 Jul 2016 14:08:00 +0200
changeset 307528 2565f0eeecf9ee9359e893ce35fc92ad1fb01317
parent 307527 83d330d8b4887009434d911a2359cecac6f40553
child 307763 cbdc4af95b6ad32fb32f776e2b3c0673e0461e3b
push id20187
push usercbook@mozilla.com
push dateTue, 02 Aug 2016 10:52:19 +0000
treeherderfx-team@2565f0eeecf9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1290756
milestone51.0a1
Bug 1290756 - Remove Help Viewer from Toolkit. r=gps
old-configure.in
toolkit/components/help/content/contents.rdf
toolkit/components/help/content/contextHelp.js
toolkit/components/help/content/help.js
toolkit/components/help/content/help.xul
toolkit/components/help/content/helpContextOverlay.xul
toolkit/components/help/content/platformClasses.css
toolkit/components/help/jar.mn
toolkit/components/help/moz.build
toolkit/components/moz.build
toolkit/locales/en-US/chrome/mozapps/help/help-toc.rdf
toolkit/locales/en-US/chrome/mozapps/help/help.dtd
toolkit/locales/en-US/chrome/mozapps/help/help.properties
toolkit/locales/en-US/chrome/mozapps/help/welcome.xhtml
toolkit/locales/jar.mn
toolkit/themes/linux/help/help.css
toolkit/themes/linux/help/jar.mn
toolkit/themes/linux/help/moz.build
toolkit/themes/linux/moz.build
toolkit/themes/osx/help/Toolbar.png
toolkit/themes/osx/help/Weblink.png
toolkit/themes/osx/help/dropmark-nav.png
toolkit/themes/osx/help/help.css
toolkit/themes/osx/help/helpFileLayout.css
toolkit/themes/osx/help/jar.mn
toolkit/themes/osx/help/moz.build
toolkit/themes/osx/moz.build
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/windows/help/Toolbar-rtl.png
toolkit/themes/windows/help/Toolbar.png
toolkit/themes/windows/help/Weblink-rtl.png
toolkit/themes/windows/help/Weblink.png
toolkit/themes/windows/help/help.css
toolkit/themes/windows/help/helpFileLayout.css
toolkit/themes/windows/help/jar.mn
toolkit/themes/windows/help/moz.build
toolkit/themes/windows/moz.build
--- a/old-configure.in
+++ b/old-configure.in
@@ -2480,17 +2480,16 @@ VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PERMISSIONS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
-MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
@@ -4721,24 +4720,16 @@ then
 fi
 
 if test -n "$MOZ_SYSTEM_SQLITE"; then
     AC_DEFINE(MOZ_SYSTEM_SQLITE)
 fi
 AC_SUBST(MOZ_SYSTEM_SQLITE)
 
 dnl ========================================================
-dnl = Enable help viewer (off by default)
-dnl ========================================================
-if test -n "$MOZ_HELP_VIEWER"; then
-     dnl Do this if defined in confvars.sh
-     AC_DEFINE(MOZ_HELP_VIEWER)
-fi
-
-dnl ========================================================
 dnl = Enable safe browsing (anti-phishing)
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(safe-browsing,
 [  --enable-safe-browsing  Enable safe browsing (anti-phishing) implementation],
     MOZ_SAFE_BROWSING=1,
     MOZ_SAFE_BROWSING= )
 if test -n "$MOZ_SAFE_BROWSING"; then
     AC_DEFINE(MOZ_SAFE_BROWSING)
@@ -6077,17 +6068,16 @@ AC_SUBST(MOZ_PREF_EXTENSIONS)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST_SET(MOZ_EXTENSIONS)
 AC_SUBST(LIBICONV)
 AC_SUBST(MOZ_TOOLKIT_SEARCH)
 AC_SUBST(MOZ_FEEDS)
 AC_SUBST(NS_PRINTING)
-AC_SUBST(MOZ_HELP_VIEWER)
 
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_SPELLCHECK)
 AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
 AC_SUBST(MOZ_CRASHREPORTER)
 AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
 AC_SUBST(MOZ_CRASHREPORTER_UPLOAD_FULL_SYMBOLS)
deleted file mode 100644
--- a/toolkit/components/help/content/contents.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-#
-# 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/.
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-# Packages
-    <RDF:Seq RDF:about="urn:mozilla:package:root">
-        <RDF:li RDF:resource="urn:mozilla:package:help"/>
-    </RDF:Seq>
-
-# Package Description
-    <RDF:Description RDF:about="urn:mozilla:package:help"
-        chrome:name="help" />
-
-</RDF:RDF>
deleted file mode 100644
--- a/toolkit/components/help/content/contextHelp.js
+++ /dev/null
@@ -1,69 +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/.
-
-# Set the default content pack to the Mozilla content pack. Use the
-# setHelpFileURI function to set this value.
-var helpFileURI;
-
-# openHelp - Opens up the Mozilla Help Viewer with the specified
-#    topic and content pack.
-# see http://www.mozilla.org/projects/help-viewer/content_packs.html
-function openHelp(topic, contentPack)
-{
-# helpFileURI is the content pack to use in this function. If contentPack is defined,
-# use that and set the helpFileURI to that value so that it will be the default.
-  helpFileURI = contentPack || helpFileURI;
-
-# Try to find previously opened help.
-  var topWindow = locateHelpWindow(helpFileURI);
-
-  if ( topWindow ) {
-# Open topic in existing window.
-    topWindow.focus();
-    topWindow.displayTopic(topic);
-  } else {
-# Open topic in new window.
-    const params = Components.classes["@mozilla.org/embedcomp/dialogparam;1"]
-                             .createInstance(Components.interfaces.nsIDialogParamBlock);
-    params.SetNumberStrings(2);
-    params.SetString(0, helpFileURI);
-    params.SetString(1, topic);
-    const ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                         .getService(Components.interfaces.nsIWindowWatcher);
-#ifdef XP_WIN
-#define HELP_ALWAYS_RAISED_TOGGLE
-#endif
-#ifdef HELP_ALWAYS_RAISED_TOGGLE
-    ww.openWindow(null, "chrome://help/content/help.xul", "_blank", "chrome,all,alwaysRaised,dialog=no", params);
-#else
-    ww.openWindow(null, "chrome://help/content/help.xul", "_blank", "chrome,all,dialog=no", params);
-#endif
-  }
-}
-
-# setHelpFileURI - Sets the default content pack to use in the Help Viewer
-function setHelpFileURI(rdfURI)
-{
-  helpFileURI = rdfURI;
-}
-
-# Locate existing help window for this content pack.
-function locateHelpWindow(contentPack) {
-    const windowManagerInterface = Components
-        .classes['@mozilla.org/appshell/window-mediator;1'].getService()
-        .QueryInterface(Components.interfaces.nsIWindowMediator);
-    const iterator = windowManagerInterface.getEnumerator("mozilla:help");
-    var topWindow = null;
-    var aWindow;
-
-# Loop through help windows looking for one with selected content
-# pack.
-    while (iterator.hasMoreElements()) {
-        aWindow = iterator.getNext();
-        if (!aWindow.closed && aWindow.getHelpFileURI() == contentPack) {
-            topWindow = aWindow;
-        }
-    }
-    return topWindow;
-}
deleted file mode 100644
--- a/toolkit/components/help/content/help.js
+++ /dev/null
@@ -1,776 +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/.
-
-# Global Variables
-var helpBrowser;
-var helpSearchPanel;
-var emptySearch;
-var emptySearchText;
-var emptySearchLink = "about:blank";
-var helpTocPanel;
-var helpIndexPanel;
-var helpGlossaryPanel;
-var strBundle;
-var gTocDSList = "";
-
-# Namespaces
-const NC = "http://home.netscape.com/NC-rdf#";
-const MAX_LEVEL = 40; // maximum depth of recursion in search datasources.
-const MAX_HISTORY_MENU_ITEMS = 6;
-
-# ifdef logic ripped from toolkit/components/help/content/platformClasses.css
-#ifdef XP_WIN
-const platform = "win";
-#else
-#ifdef XP_MACOSX
-const platform = "mac";
-#else
-const platform = "unix";
-#endif
-#endif
-
-# Resources
-const RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-    .getService(Components.interfaces.nsIRDFService);
-const RDF_ROOT = RDF.GetResource("urn:root");
-const NC_PANELLIST = RDF.GetResource(NC + "panellist");
-const NC_PANELID = RDF.GetResource(NC + "panelid");
-const NC_EMPTY_SEARCH_TEXT = RDF.GetResource(NC + "emptysearchtext");
-const NC_EMPTY_SEARCH_LINK = RDF.GetResource(NC + "emptysearchlink");
-const NC_DATASOURCES = RDF.GetResource(NC + "datasources");
-const NC_PLATFORM = RDF.GetResource(NC + "platform");
-const NC_SUBHEADINGS = RDF.GetResource(NC + "subheadings");
-const NC_NAME = RDF.GetResource(NC + "name");
-const NC_CHILD = RDF.GetResource(NC + "child");
-const NC_LINK = RDF.GetResource(NC + "link");
-const NC_TITLE = RDF.GetResource(NC + "title");
-const NC_BASE = RDF.GetResource(NC + "base");
-const NC_DEFAULTTOPIC = RDF.GetResource(NC + "defaulttopic");
-
-var RDFContainer =
-   Components.classes["@mozilla.org/rdf/container;1"]
-             .createInstance(Components.interfaces.nsIRDFContainer);
-const CONSOLE_SERVICE = Components.classes['@mozilla.org/consoleservice;1']
-    .getService(Components.interfaces.nsIConsoleService);
-
-var RE;
-
-var helpFileURI;
-var helpFileDS;
-# Set from nc:base attribute on help rdf file. It may be used for prefix
-# reduction on all links within the current help set.
-var helpBaseURI;
-
-/* defaultTopic is either set
-   1. in the openHelp() call, passed as an argument to the Help window and
-      evaluated in init(), or
-   2. in nc:defaulttopic in the content pack (e.g. firebirdhelp.rdf),
-      evaluated in loadHelpRDF(), or
-   3. "welcome" as a fallback, specified in loadHelpRDF() as well;
-      displayTopic() then uses defaultTopic because topic is null. */
-var defaultTopic;
-
-const NSRESULT_RDF_SYNTAX_ERROR = 0x804e03f7;
-
-# This function is called by dialogs/windows that want to display
-# context-sensitive help
-# These dialogs/windows should include the script
-# chrome://help/content/contextHelp.js
-function displayTopic(topic) {
-    // Get the page to open.
-    var uri = getLink(topic);
-    // Use default topic if specified topic is not found.
-    if (!uri) {
-        uri = getLink(defaultTopic);
-    }
-    // Load the page.
-    if (uri)
-      loadURI(uri);
-}
-
-# Initialize the Help window
-function init() {
-  // Cache panel references.
-  helpSearchPanel = document.getElementById("help-search-panel");
-  helpTocPanel = document.getElementById("help-toc-panel");
-  helpIndexPanel = document.getElementById("help-index-panel");
-  helpGlossaryPanel = document.getElementById("help-glossary-panel");
-  helpBrowser = document.getElementById("help-content");
-
-  // Turn off unnecessary features for security
-  helpBrowser.docShell.allowJavascript = false;
-  helpBrowser.docShell.allowPlugins = false;
-  helpBrowser.docShell.allowSubframes = false;
-  helpBrowser.docShell.allowMetaRedirects = false;
-
-  strBundle = document.getElementById("bundle_help");
-  emptySearchText = strBundle.getString("emptySearchText");
-
-  // Get the content pack, base URL, and help topic
-  var helpTopic = defaultTopic;
-  if ("arguments" in window && 
-       window.arguments[0] instanceof Components.interfaces.nsIDialogParamBlock) {
-    helpFileURI = window.arguments[0].GetString(0);
-    // trailing "/" included.
-    helpBaseURI = helpFileURI.substring(0, helpFileURI.lastIndexOf("/")+1);
-    helpTopic = window.arguments[0].GetString(1);
-  }
-
-  loadHelpRDF();
-  displayTopic(helpTopic);
-
-  // Move to Center of Screen
-  const width = document.documentElement.getAttribute("width");
-  const height = document.documentElement.getAttribute("height");
-  window.moveTo((screen.availWidth - width) / 2, (screen.availHeight - height) / 2);
-
-  // Initialize history.
-  getWebNavigation().sessionHistory = 
-    Components.classes["@mozilla.org/browser/shistory;1"]
-              .createInstance(Components.interfaces.nsISHistory);
-  window.XULBrowserWindow = new nsHelpStatusHandler();
-
-  //Start the status handler.
-  window.XULBrowserWindow.init();
-
-  // Hook up UI through Progress Listener
-  const interfaceRequestor = helpBrowser.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-  const webProgress = interfaceRequestor.getInterface(Components.interfaces.nsIWebProgress);
-
-  webProgress.addProgressListener(window.XULBrowserWindow, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
-
-  var searchBox = document.getElementById("findText");
-  searchBox.clickSelectsAll = getBoolPref("browser.urlbar.clickSelectsAll", true);
-
-  setTimeout(focusSearch, 0);
-}
-
-function showSearchSidebar() {
-  // if you tab too quickly, you end up with stuck focus, revert focus to the searchbar
-  var searchTree = document.getElementById("help-toc-panel");
-  if (searchTree.treeBoxObject.focused) {
-    focusSearch();
-  }
-
-  var tableOfContents = document.getElementById("help-toc-sidebar");
-  tableOfContents.setAttribute("hidden", "true");
-
-  var sidebar = document.getElementById("help-search-sidebar");
-  sidebar.removeAttribute("hidden");
-}
-
-function hideSearchSidebar(aEvent) {
-  // if we're focused in the search results, focus content
-  var searchTree = document.getElementById("help-search-tree");
-  if (searchTree.treeBoxObject.focused) {
-    content.focus();
-  }
-
-  var sidebar = document.getElementById("help-search-sidebar");
-  sidebar.setAttribute("hidden", "true");
-
-  var tableOfContents = document.getElementById("help-toc-sidebar");
-  tableOfContents.removeAttribute("hidden");
-}
-
-# loadHelpRDF
-# Parse the provided help content pack RDF file, and use it to
-# populate the datasources attached to the trees in the viewer.
-# Filter out any information not applicable to the user's platform.
-function loadHelpRDF() {
-  if (!helpFileDS) {
-    try {
-      helpFileDS = RDF.GetDataSourceBlocking(helpFileURI);
-    } catch (e if (e.result == NSRESULT_RDF_SYNTAX_ERROR)) {
-      log("Help file: " + helpFileURI + " contains a syntax error.");
-    } catch (e) {
-      log("Help file: " + helpFileURI + " was not found.");
-    }
-
-    try {
-      document.title = getAttribute(helpFileDS, RDF_ROOT, NC_TITLE, "");
-      helpBaseURI = getAttribute(helpFileDS, RDF_ROOT, NC_BASE, helpBaseURI);
-      // if there's no nc:defaulttopic in the content pack, set "welcome"
-      // as the default topic
-      defaultTopic = getAttribute(helpFileDS,
-        RDF_ROOT, NC_DEFAULTTOPIC, "welcome");
-
-      var panelDefs = helpFileDS.GetTarget(RDF_ROOT, NC_PANELLIST, true);
-      RDFContainer.Init(helpFileDS, panelDefs);
-      var iterator = RDFContainer.GetElements();
-      while (iterator.hasMoreElements()) {
-        var panelDef = iterator.getNext();
-
-        var panelID        = getAttribute(helpFileDS, panelDef, NC_PANELID, null);
-        var datasources    = getAttribute(helpFileDS, panelDef, NC_DATASOURCES, "");
-        var panelPlatforms = getAttribute(helpFileDS, panelDef, NC_PLATFORM, null);
-
-        if (panelPlatforms && panelPlatforms.split(/\s+/).indexOf(platform) == -1)
-          continue; // ignore datasources for other platforms
-
-        // empty datasources are valid on search panel definitions
-        // convert them to "rdf:null" which can be filtered and ignored
-        if (!datasources)
-          datasources = "rdf:null";
-
-        datasources = normalizeLinks(helpBaseURI, datasources);
-
-        var datasourceArray = datasources.split(/\s+/)
-                                         .filter(function(x) { return x != "rdf:null"; })
-                                         .map(RDF.GetDataSourceBlocking);
-
-        // Cache Additional Datasources to Augment Search Datasources.
-        if (panelID == "search") {
-          emptySearchText = getAttribute(helpFileDS, panelDef, NC_EMPTY_SEARCH_TEXT, emptySearchText);
-          emptySearchLink = getAttribute(helpFileDS, panelDef, NC_EMPTY_SEARCH_LINK, emptySearchLink);
-
-          datasourceArray.forEach(helpSearchPanel.database.AddDataSource,
-                                  helpSearchPanel.database);
-          if (!panelPlatforms)
-            filterDatasourceByPlatform(helpSearchPanel.database);
-
-          continue; // to next panel definition
-        }
-
-        // cache toc datasources list for use in getLink()
-        if (panelID == "toc")
-          gTocDSList += " " + datasources;
-
-        var tree = document.getElementById("help-" + panelID + "-panel");
-
-        // add each datasource to the current tree
-        datasourceArray.forEach(tree.database.AddDataSource,
-                                tree.database);
-
-        // filter and display the current tree
-        if (!panelPlatforms)
-          filterDatasourceByPlatform(tree.database);
-        tree.builder.rebuild();
-      }
-    } catch (e) {
-      log(e + "");
-    }
-  }
-}
-
-# filterDatasourceByPlatform
-# Remove statements for other platforms from a datasource.
-function filterDatasourceByPlatform(aDatasource) {
-  filterNodeByPlatform(aDatasource, RDF_ROOT, 0);
-}
-
-# filterNodeByPlatform
-# Remove statements for other platforms from the provided datasource.
-function filterNodeByPlatform(aDatasource, aCurrentResource, aCurrentLevel) {
-  if (aCurrentLevel > MAX_LEVEL) {
-     log("Datasources over " + MAX_LEVEL + " levels deep are unsupported.");
-     return;
-  }
-
-  // get the subheadings under aCurrentResource and filter them
-  var nodes = aDatasource.GetTargets(aCurrentResource, NC_SUBHEADINGS, true);
-  while (nodes.hasMoreElements()) {
-    var node = nodes.getNext();
-    node = node.QueryInterface(Components.interfaces.nsIRDFResource);
-    // should we test for rdf:Seq here?  see also doFindOnDatasource
-    filterSeqByPlatform(aDatasource, node, aCurrentLevel+1);
-  }
-}
-
-# filterSeqByPlatform
-# Go through the children of aNode, if any, removing statements applicable
-# only on other platforms.
-function filterSeqByPlatform(aDatasource, aNode, aCurrentLevel) {
-  // get nc:subheading children into an enumerator
-  var RDFC = Components.classes["@mozilla.org/rdf/container;1"]
-                       .createInstance(Components.interfaces.nsIRDFContainer);
-  RDFC.Init(aDatasource, aNode);
-  var targets = RDFC.GetElements();
-
-  // process items in the rdf:Seq
-  while (targets.hasMoreElements()) {
-    var currentTarget = targets.getNext();
-
-    // find out on which platforms this node is meaningful
-    var nodePlatforms = getAttribute(aDatasource,
-                                     currentTarget.QueryInterface(Components.interfaces.nsIRDFResource),
-                                     NC_PLATFORM,
-                                     platform);
-
-    if (nodePlatforms.split(/\s+/).indexOf(platform) == -1) { // node is for another platform
-      var currentNode = currentTarget.QueryInterface(Components.interfaces.nsIRDFNode);
-      // "false" because we don't want to renumber elements in the container
-      RDFC.RemoveElement(currentNode, false);
-
-      // move to next node - ignore the children, because 1) they might be
-      // needed elsewhere and 2) nodes not connected to RDF_ROOT are ignored
-      continue;
-    }
-
-    // filter any children
-    filterNodeByPlatform(aDatasource, currentTarget, aCurrentLevel+1);
-  }
-}
-
-# Prepend helpBaseURI to list of space separated links if they don't start with
-# "chrome:"
-function normalizeLinks(helpBaseURI, links) {
-  if (!helpBaseURI) {
-    return links;
-  }
-  var ls = links.split(/\s+/);
-  if (ls.length == 0) {
-    return links;
-  }
-  for (var i=0; i < ls.length; ++i) {
-    if (ls[i] == "")
-      continue;
-      
-    if (ls[i].substr(0,7) != "chrome:" && ls[i].substr(0,4) != "rdf:")
-      ls[i] = helpBaseURI + ls[i];
-  }
-  return ls.join(" ");
-}
-
-function getLink(ID) {
-    if (!ID)
-      return null;
-
-    var tocDS = document.getElementById("help-toc-panel").database;
-    if (!tocDS)
-      return null;
-
-    // URIs include both the ID part and the base file name,
-    // so we need to check for a matching ID in each datasource
-    var tocDSArray = gTocDSList.split(/\s+/)
-                               .filter(function(x) { return x != "rdf:null"; });
-
-    for (var i = 0; i < tocDSArray.length; i++) {
-      var resource = RDF.GetResource(tocDSArray[i] + "#" + ID);
-      var link = tocDS.GetTarget(resource, NC_LINK, true);
-      if (!link)  // no such rdf:ID found
-        continue;
-      return link.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
-    }
-    return null;
-}
-
-# Called by contextHelp.js to determine if this window is displaying the
-# requested help file.
-function getHelpFileURI() {
-    return helpFileURI;
-}
-
-function getBrowser() {
-  return helpBrowser;
-}
-
-function getWebNavigation() {
-  try {
-    return helpBrowser.webNavigation;
-  } catch (e)
-  {
-    return null;
-  }
-}
-
-function loadURI(uri) {
-    if (uri.substr(0,7) != "chrome:") {
-        uri = helpBaseURI + uri;
-    }
-    getWebNavigation().loadURI(uri, Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE,
-        null, null, null);
-}
-
-function goBack() {
-  try
-  {
-    getWebNavigation().goBack();
-  } catch (e)
-  {
-  }
-}
-
-function goForward() {
-    try
-    {
-      getWebNavigation().goForward();
-    } catch(e)
-    {
-    }
-}
-
-function goHome() {
-    // Load "Welcome" page
-    displayTopic(defaultTopic);
-}
-
-function print() {
-    try {
-        _content.print();
-    } catch (e) {
-    }
-}
-
-function FillHistoryMenu(aParent, aMenu)
-  {
-    // Remove old entries if any
-    deleteHistoryItems(aParent);
-
-    var sessionHistory = getWebNavigation().sessionHistory;
-
-    var count = sessionHistory.count;
-    var index = sessionHistory.index;
-    var end;
-    var j;
-    var entry;
-
-    switch (aMenu)
-      {
-        case "back":
-          end = (index > MAX_HISTORY_MENU_ITEMS) ? index - MAX_HISTORY_MENU_ITEMS : 0;
-          if ((index - 1) < end) return false;
-          for (j = index - 1; j >= end; j--)
-            {
-              entry = sessionHistory.getEntryAtIndex(j, false);
-              if (entry)
-                createMenuItem(aParent, j, entry.title);
-            }
-          break;
-        case "forward":
-          end  = ((count-index) > MAX_HISTORY_MENU_ITEMS) ? index + MAX_HISTORY_MENU_ITEMS : count - 1;
-          if ((index + 1) > end) return false;
-          for (j = index + 1; j <= end; j++)
-            {
-              entry = sessionHistory.getEntryAtIndex(j, false);
-              if (entry)
-                createMenuItem(aParent, j, entry.title);
-            }
-          break;
-      }
-    return true;
-  }
-
-function createMenuItem( aParent, aIndex, aLabel)
-  {
-    var menuitem = document.createElement( "menuitem" );
-    menuitem.setAttribute( "label", aLabel );
-    menuitem.setAttribute( "index", aIndex );
-    aParent.appendChild( menuitem );
-  }
-
-function deleteHistoryItems(aParent)
-{
-  var children = aParent.childNodes;
-  for (var i = children.length - 1; i >= 0; --i)
-    {
-      var index = children[i].getAttribute("index");
-      if (index)
-        aParent.removeChild(children[i]);
-    }
-}
-
-function createBackMenu(event) {
-    return FillHistoryMenu(event.target, "back");
-}
-
-function createForwardMenu(event) {
-    return FillHistoryMenu(event.target, "forward");
-}
-
-function gotoHistoryIndex(aEvent) {
-    var index = aEvent.target.getAttribute("index");
-    if (!index) {
-        return false;
-    }
-    try {
-        getWebNavigation().gotoIndex(index);
-    } catch(ex) {
-        return false;
-    }
-    return true;
-}
-
-function nsHelpStatusHandler() {
-  this.init();
-}
-
-nsHelpStatusHandler.prototype = {
-
-    onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus) {},
-    onProgressChange : function(aWebProgress, aRequest, aCurSelfProgress,
-        aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress) {},
-    onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage) {},
-    onSecurityChange : function(aWebProgress, aRequest, state) {},
-    onLocationChange : function(aWebProgress, aRequest, aLocation, aFlags) {
-        UpdateBackForwardButtons();
-    },
-    QueryInterface : function(aIID) {
-        if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
-                aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
-                aIID.equals(Components.interfaces.nsIXULBrowserWindow) ||
-                aIID.equals(Components.interfaces.nsISupports)) {
-            return this;
-        }
-        throw Components.results.NS_NOINTERFACE;
-    },
-
-    init : function() {},
-
-    destroy : function() {},
-
-    setJSStatus : function(status) {},
-    setOverLink : function(link, context) {},
-    onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {}
-}
-
-function UpdateBackForwardButtons() {
-    var backBroadcaster = document.getElementById("canGoBack");
-    var forwardBroadcaster = document.getElementById("canGoForward");
-    var webNavigation = getWebNavigation();
-
-    // Avoid setting attributes on broadcasters if the value hasn't changed!
-    // Remember, guys, setting attributes on elements is expensive!  They
-    // get inherited into anonymous content, broadcast to other widgets, etc.!
-    // Don't do it if the value hasn't changed! - dwh
-
-    var backDisabled = (backBroadcaster.getAttribute("disabled") == "true");
-    var forwardDisabled = (forwardBroadcaster.getAttribute("disabled") == "true");
-
-    if (backDisabled == webNavigation.canGoBack) {
-      if (backDisabled)
-        backBroadcaster.removeAttribute("disabled");
-      else
-        backBroadcaster.setAttribute("disabled", true);
-    }
-
-    if (forwardDisabled == webNavigation.canGoForward) {
-      if (forwardDisabled)
-        forwardBroadcaster.removeAttribute("disabled");
-      else
-        forwardBroadcaster.setAttribute("disabled", true);
-    }
-}
-
-function onselect_loadURI(tree) {
-    try {
-        var resource = tree.view.getResourceAtIndex(tree.currentIndex);
-        var link = tree.database.GetTarget(resource, NC_LINK, true);
-        if (link) {
-            link = link.QueryInterface(Components.interfaces.nsIRDFLiteral);
-            loadURI(link.Value);
-        }
-    } catch (e) {
-    }// when switching between tabs a spurious row number is returned.
-}
-
-function focusSearch() {
-  var searchBox = document.getElementById("findText");
-  searchBox.focus();
-}
-
-# doFind - Searches the help files for what is located in findText and outputs into
-#        the find search tree.
-function doFind() {
-    if (document.getElementById("help-search-sidebar").hidden)
-      showSearchSidebar();
-
-    var searchTree = document.getElementById("help-search-tree");
-    var findText = document.getElementById("findText");
-
-    // clear any previous results.
-    clearDatabases(searchTree.database);
-
-    // if the search string is empty or contains only whitespace, purge the results tree and return
-    RE = findText.value.match(/\S+/g);
-    if (!RE) {
-      searchTree.builder.rebuild();
-      hideSearchSidebar();
-      return;
-    }
-
-    // compile the search string, which has already been split up above, into regexps
-    for (var i=0; i < RE.length; ++i) {
-      RE[i] = new RegExp(RE[i], "i");
-    }
-    emptySearch = true;
-
-    // search TOC
-    var resultsDS = Components.classes["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"]
-        .createInstance(Components.interfaces.nsIRDFDataSource);
-    var sourceDS = helpTocPanel.database;
-    doFindOnDatasource(resultsDS, sourceDS, RDF_ROOT, 0);
-
-    // search glossary.
-    sourceDS = helpGlossaryPanel.database;
-    doFindOnDatasource(resultsDS, sourceDS, RDF_ROOT, 0);
-
-    // search index
-    sourceDS = helpIndexPanel.database;
-    doFindOnDatasource(resultsDS, sourceDS, RDF_ROOT, 0);
-
-    // search additional search datasources
-    sourceDS = helpSearchPanel.database;
-    doFindOnDatasource(resultsDS, sourceDS, RDF_ROOT, 0);
-
-    if (emptySearch)
-        assertSearchEmpty(resultsDS);
-    // Add the datasource to the search tree
-    searchTree.database.AddDataSource(resultsDS);
-    searchTree.builder.rebuild();
-}
-
-function clearDatabases(compositeDataSource) {
-    var enumDS = compositeDataSource.GetDataSources()
-    while (enumDS.hasMoreElements()) {
-        var ds = enumDS.getNext();
-        compositeDataSource.RemoveDataSource(ds);
-    }
-}
-
-function doFindOnDatasource(resultsDS, sourceDS, resource, level) {
-    if (level > MAX_LEVEL) {
-        try {
-            log("Recursive reference to resource: " + resource.Value + ".");
-        } catch (e) {
-            log("Recursive reference to unknown resource.");
-        }
-        return;
-    }
-    // find all SUBHEADING children of current resource.
-    var targets = sourceDS.GetTargets(resource, NC_SUBHEADINGS, true);
-    while (targets.hasMoreElements()) {
-        var target = targets.getNext();
-        target = target.QueryInterface(Components.interfaces.nsIRDFResource);
-        // The first child of a rdf:subheading should (must) be a rdf:seq.
-        // Should we test for a SEQ here?
-        doFindOnSeq(resultsDS, sourceDS, target, level+1);
-    }
-}
-
-function doFindOnSeq(resultsDS, sourceDS, resource, level) {
-    // load up an RDFContainer so we can access the contents of the current
-    // rdf:seq.
-    RDFContainer.Init(sourceDS, resource);
-    var targets = RDFContainer.GetElements();
-    while (targets.hasMoreElements()) {
-        var target = targets.getNext();
-        var link = sourceDS.GetTarget(target, NC_LINK, true);
-        var name = sourceDS.GetTarget(target, NC_NAME, true);
-
-        if (link &&
-            name instanceof Components.interfaces.nsIRDFLiteral &&
-            isMatch(name.Value)) {
-            // we have found a search entry - add it to the results datasource.
-            var urn = RDF.GetAnonymousResource();
-            resultsDS.Assert(urn, NC_NAME, name, true);
-            resultsDS.Assert(urn, NC_LINK, link, true);
-            resultsDS.Assert(RDF_ROOT, NC_CHILD, urn, true);
-
-            emptySearch = false;
-        }
-        // process any nested rdf:seq elements.
-        doFindOnDatasource(resultsDS, sourceDS, target, level+1);
-    }
-}
-
-function assertSearchEmpty(resultsDS) {
-    var resSearchEmpty = RDF.GetResource("urn:emptySearch");
-        resultsDS.Assert(RDF_ROOT,
-            NC_CHILD,
-                resSearchEmpty,
-                true);
-        resultsDS.Assert(resSearchEmpty,
-            NC_NAME,
-                RDF.GetLiteral(emptySearchText),
-                true);
-        resultsDS.Assert(resSearchEmpty,
-                NC_LINK,
-                RDF.GetLiteral(emptySearchLink),
-                true);
-}
-
-function isMatch(text) {
-    for (var i=0; i < RE.length; ++i ) {
-        if (!RE[i].test(text)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-function getAttribute(datasource, resource, attributeResourceName,
-        defaultValue) {
-    var literal = datasource.GetTarget(resource, attributeResourceName, true);
-    if (!literal) {
-        return defaultValue;
-    }
-    return getLiteralValue(literal, defaultValue);
-}
-
-function getLiteralValue(literal, defaultValue) {
-    if (literal) {
-        literal = literal.QueryInterface(Components.interfaces.nsIRDFLiteral);
-        if (literal) {
-            return literal.Value;
-        }
-    }
-    if (defaultValue) {
-        return defaultValue;
-    }
-    return null;
-}
-
-# Write debug string to error console.
-function log(aText) {
-    CONSOLE_SERVICE.logStringMessage(aText);
-}
-
-function getBoolPref (aPrefname, aDefault)
-{
-  try { 
-    var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                         .getService(Components.interfaces.nsIPrefBranch);
-    return pref.getBoolPref(aPrefname);
-  }
-  catch(e) {
-    return aDefault;
-  }
-}
-
-# getXulWin - Returns the current Help window as a nsIXULWindow.
-function getXulWin()
-{
-  window.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-  var webnav = window.getInterface(Components.interfaces.nsIWebNavigation);
-  var dsti = webnav.QueryInterface(Components.interfaces.nsIDocShellTreeItem);
-  var treeowner = dsti.treeOwner;
-  var ifreq = treeowner.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-
-  return ifreq.getInterface(Components.interfaces.nsIXULWindow);
-}
-
-# toggleZLevel - Toggles whether or not the window will always appear on top. Because
-#   alwaysRaised is not supported on an OS other than Windows, this code will not
-#   appear in those builds.
-#
-#   element - The DOM node that persists the checked state.
-#ifdef XP_WIN
-#define HELP_ALWAYS_RAISED_TOGGLE
-#endif
-#ifdef HELP_ALWAYS_RAISED_TOGGLE
-function toggleZLevel(element)
-{
-  var xulwin = getXulWin();
-  
-  // Now we can flip the zLevel, and set the attribute so that it persists correctly
-  if (xulwin.zLevel > xulwin.normalZ) {
-    xulwin.zLevel = xulwin.normalZ;
-    element.setAttribute("checked", "false");
-  } else {
-    xulwin.zLevel = xulwin.raisedZ;
-    element.setAttribute("checked", "true");
-  }
-}
-#endif
deleted file mode 100644
--- a/toolkit/components/help/content/help.xul
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-# 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://help/skin/" type="text/css"?>
-
-<?xul-overlay href="chrome://help/content/helpContextOverlay.xul"?>
-<!DOCTYPE window [
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-    %brandDTD;
-    <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
-    %helpDTD;
-]>
-
-<window id="help"
-        windowtype="mozilla:help"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        width="700"
-        height="550"
-#ifdef XP_WIN
-#define HELP_ALWAYS_RAISED_TOGGLE
-#endif
-#ifdef HELP_ALWAYS_RAISED_TOGGLE
-        persist="width height screenX screenY zlevel"
-#else
-        persist="width height screenX screenY"
-#endif
-        onload="init();"
-        onunload="window.XULBrowserWindow.destroy();">
-
-  <script type="application/javascript" src="chrome://help/content/help.js"/>
-  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-
-  <menupopup id="backMenu" position="after_start"
-             onpopupshowing="return createBackMenu(event);"
-             oncommand="gotoHistoryIndex(event);"/>
-  <menupopup id="forwardMenu" position="after_start"
-             onpopupshowing="return createForwardMenu(event);"
-             oncommand="gotoHistoryIndex(event);"/>
-  <popupset id="contentAreaContextSet"/>
-
-  <broadcasterset id="helpBroadcasters">
-    <broadcaster id="canGoBack"    disabled="true"/>
-    <broadcaster id="canGoForward" disabled="true"/>
-  </broadcasterset>
-  <commandset id="globalEditMenuItems"/>
-  <commandset id="selectEditMenuItems">
-    <command id="cmd_close" oncommand="close();"/>
-    <command id="Help:Home" oncommand="goHome();"/>
-    <command id="Help:Back" oncommand="goBack();"       observes="canGoBack"/>
-    <command id="Help:Forward" oncommand="goForward();" observes="canGoForward"/>
-    <command id="Help:ToggleSidebar" oncommand="toggleSidebar();"/>
-    <command id="cmd_closeWindow" oncommand="close();"/>
-    <command id="cmd_fullZoomReduce" oncommand="ZoomManager.reduce();"/>
-    <command id="cmd_fullZoomEnlarge" oncommand="ZoomManager.enlarge();"/>
-    <command id="cmd_fullZoomReset" oncommand="ZoomManager.reset();"/>
-    <command id="cmd_find"
-             oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
-    <command id="cmd_findAgain"
-             oncommand="document.getElementById('FindToolbar').onFindAgainCommand(false);"/>
-    <command id="cmd_findPrevious"
-             oncommand="document.getElementById('FindToolbar').onFindAgainCommand(true);"/>
-    <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')" disabled="true"/>
-    <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')"/>
-  </commandset>
-  <keyset id="keys">
-    <key id="goHome"      keycode="VK_HOME"  command="Help:Home" modifiers="alt"/>
-#ifdef XP_UNIX
-    <key key="&goBackCmd.commandkey;" command="Help:Back" modifiers="accel"/>
-    <key key="&goForwardCmd.commandkey;" command="Help:Forward" modifiers="accel"/>
-#endif
-#ifdef XP_MACOSX
-    <key id="goBackKb"    keycode="VK_LEFT"  command="Help:Back" modifiers="accel"/>
-    <key id="goForwardKb" keycode="VK_RIGHT" command="Help:Forward" modifiers="accel"/>
-#else
-    <key id="goBackKb"     keycode="VK_LEFT"  command="Help:Back" modifiers="alt"/>
-    <key id="goForwardKb"  keycode="VK_RIGHT" command="Help:Forward" modifiers="alt"/>
-    <key keycode="VK_BACK" command="Help:Back"/>
-    <key keycode="VK_BACK" command="Help:Forward" modifiers="shift"/>
-#endif
-    <key id="printKb" key="&printCmd.commandkey;" oncommand="print();"
-         modifiers="accel"/>  
-    <key id="key_find" key="&findOnCmd.commandkey;" command="cmd_find" modifiers="accel"/>
-    <key id="key_findAgain" key="&findAgainCmd.commandkey;" command="cmd_findAgain" modifiers="accel"/>
-    <key id="key_findPrevious" key="&findAgainCmd.commandkey;" command="cmd_findPrevious" modifiers="accel,shift"/>
-    <key keycode="&findAgainCmd.commandkey2;" command="cmd_findAgain"/>
-    <key keycode="&findAgainCmd.commandkey2;"  command="cmd_findPrevious" modifiers="shift"/>
-    <key id="key_closeWindow" key="&closeWindow.commandkey;"
-         command="cmd_closeWindow" modifiers="accel"/>
-    <key id="key_closeSearchSidebar" keycode="VK_ESCAPE"
-         oncommand="hideSearchSidebar(event)"/>
-    <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"
-         command="cmd_fullZoomEnlarge" modifiers="accel"/>
-    <key id="key_fullZoomEnlarge2" key="&fullZoomEnlargeCmd.commandkey2;"
-         command="cmd_fullZoomEnlarge" modifiers="accel"/>
-    <key id="key_fullZoomEnlarge3" key="&fullZoomEnlargeCmd.commandkey3;"
-         command="cmd_fullZoomEnlarge" modifiers="accel"/>
-    <key id="key_fullZoomReduce" key="&fullZoomReduceCmd.commandkey;"
-         command="cmd_fullZoomReduce" modifiers="accel"/>
-    <key id="key_fullZoomReduce2" key="&fullZoomReduceCmd.commandkey2;"
-         command="cmd_fullZoomReduce" modifiers="accel"/>
-    <key id="key_fullZoomReset" key="&fullZoomResetCmd.commandkey;"
-         command="cmd_fullZoomReset" modifiers="accel"/>
-    <key id="key_fullZoomReset2" key="&fullZoomResetCmd.commandkey2;"
-         command="cmd_fullZoomReset" modifiers="accel"/>
-    <key id="key_focusSearch" key="&helpSearch.commandkey;"
-         oncommand="focusSearch()" modifiers="accel"/>
-
-  </keyset>
-  <stringbundle id="bundle_viewZoom"/>
-  <stringbundle id="findBundle"
-                src="chrome://global/locale/finddialog.properties"/>
-  <stringbundle id="bundle_help"
-                src="chrome://help/locale/help.properties"/>
-
-    <toolbox id="help-toolbox">
-      <toolbar id="HelpToolbar" class="chromeclass-toolbar">
-        <toolbarbutton id="help-back-button" type="menu-button"
-                       label="&backButton.label;"
-                       oncommand="if (event.target == this) goBack(); else gotoHistoryIndex(event);"
-                       observes="canGoBack" context="backMenu"
-                       tooltiptext="&backButton.tooltip;">
-          <menupopup context="" onpopupshowing="createBackMenu(event);"/>
-        </toolbarbutton>
-        <toolbarbutton id="help-forward-button" type="menu-button"
-                       oncommand="if (event.target == this) goForward(); else gotoHistoryIndex(event);"
-                       tooltiptext="&forwardButton.tooltip;"
-                       observes="canGoForward">
-          <menupopup context="" onpopupshowing="createForwardMenu(event);"/>
-        </toolbarbutton>
-        <toolbarbutton id="help-home-button"
-                       tooltiptext="&homeButton.tooltip;"
-                       command="Help:Home"/>
-        <toolbarseparator/>
-        <toolbarbutton id="help-print-button"
-                       label="&printButton.label;"
-                       oncommand="print();"
-                       tooltiptext="&printButton.tooltip;"/>
-        <toolbarspring flex="1"/>
-        <toolbaritem id="search-box"
-                     align="center" pack="center">
-          <textbox id="findText" type="search" placeholder="&search.emptytext;"
-                   aria-controls="help-toc-panel"
-                   oncommand="doFind();"/>
-        </toolbaritem>
-      </toolbar>
-    </toolbox>
-
-    <hbox flex="1">
-      <vbox id="help-sidebar" persist="width">
-        <vbox flex="1" id="help-toc-sidebar">
-          <sidebarheader align="center">
-            <label id="help-toc-sidebar-header" flex="1" crop="end" value="&toctab.label;"
-                   accesskey="&toctab.accesskey;" control="help-toc-panel"/>
-          </sidebarheader>
-          <tree id="help-toc-panel" class="focusring"
-                flex="1" treelines="true" hidecolumnpicker="true"
-                datasources="rdf:null"
-                containment="http://home.netscape.com/NC-rdf#subheadings"
-                ref="urn:root" flags="dont-build-content"
-                onselect="onselect_loadURI(this)">
-            <template>
-              <rule>
-                <conditions>
-                  <content uri="?uri"/>
-                  <triple subject="?uri"
-                          predicate="http://home.netscape.com/NC-rdf#subheadings"
-                          object="?subheadings"/>
-                  <member container="?subheadings"
-                          child="?subheading"/>
-                  <triple subject="?subheading"
-                          predicate="http://home.netscape.com/NC-rdf#name"
-                          object="?name"/>
-                </conditions>
-                <action>
-                  <treechildren>
-                    <treeitem uri="?subheading">
-                      <treerow>
-                        <treecell label="?name"/>
-                      </treerow>
-                    </treeitem>
-                  </treechildren>
-                </action>
-              </rule>
-            </template>
-            <treecols>
-              <treecol id="NameColumn" flex="1" hideheader="true"
-                       primary="true"/>
-            </treecols>
-          </tree>
-        </vbox>
-        <vbox id="help-search-sidebar" hidden="true" flex="1">
-          <sidebarheader align="center">
-            <label id="help-search-sidebar-header" flex="1" crop="end"
-                   value="&searchHeader.label;"/>
-          </sidebarheader>
-          <tree id="help-search-tree" class="focusring"
-                flex="1" hidecolumnpicker="true"
-                datasources="rdf:null"
-                containment="http://home.netscape.com/NC-rdf#child"
-                ref="urn:root" flags="dont-build-content"
-                onselect="onselect_loadURI(this)">
-            <template>
-              <rule>
-                <conditions>
-                  <content uri="?uri"/>
-                  <member container="?uri"
-                          child="?subheading"/>
-                </conditions>
-                <bindings>
-                  <binding subject="?subheading"
-                           predicate="http://home.netscape.com/NC-rdf#name"
-                           object="?name"/>
-                </bindings>
-                <action>
-                  <treechildren>
-                    <treeitem uri="?subheading">
-                      <treerow>
-                        <treecell label="?name"/>
-                      </treerow>
-                    </treeitem>
-                  </treechildren>
-                </action>
-              </rule>
-            </template>
-            <treecols>
-            <treecol id="ResultsColumn" flex="1"
-                     hideheader="true" primary="true"
-                     sortActive="true" sortDirection="ascending"
-                     sort="?name"/>
-            </treecols>
-          </tree>
-        </vbox>
-
-        <!-- BEGIN hidden trees used for searching -->
-        <!-- xxxmpc: we need a better solution for this -->
-
-        <vbox id="help-sidebar-hidden-trees" hidden="true">
-          <tree id="help-glossary-panel"
-                flex="1" hidecolumnpicker="true"
-                datasources="rdf:null"
-                containment="http://home.netscape.com/NC-rdf#subheadings"
-                ref="urn:root" flags="dont-build-content"/>
-          <tree id="help-index-panel"
-                flex="1" datasources="rdf:null"
-                hidecolumnpicker="true"
-                containment="http://home.netscape.com/NC-rdf#subheadings"
-                ref="urn:root"
-                flags="dont-build-content dont-test-empty"/>
-          <tree id="help-search-panel"
-                flex="1" hidecolumnpicker="true"
-                datasources="rdf:null"
-                containment="http://home.netscape.com/NC-rdf#subheadings"
-                ref="urn:root" flags="dont-build-content"/>
-        </vbox>
-
-        <!-- END HIDDEN ITEMS -->
-      </vbox>
-
-      <splitter id="help-sidebar-splitter" collapse="before"/>
-
-      <vbox id="appcontent" flex="3">
-        <!-- type attribute is used by frame construction to locate
-             iframes intended to hold (html) content -->
-        <browser context="contentAreaContextMenu"
-                 type="content-primary" id="help-content"
-                 src="about:blank" flex="1"/>
-        <findbar id="FindToolbar" browserid="help-content"/>
-      </vbox>
-    </hbox>
-
-</window>
deleted file mode 100644
--- a/toolkit/components/help/content/helpContextOverlay.xul
+++ /dev/null
@@ -1,61 +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/.
-
-<!DOCTYPE overlay [
-    <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
-    %helpDTD;
-]>
-<overlay id="contentAreaContextOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-# Help Window's right-click menu
-  <popupset id="contentAreaContextSet">
-    <menupopup id="contentAreaContextMenu"
-               onpopupshowing="goUpdateCommand('cmd_copy')">
-      <menuitem id="context-back"
-                label="&backButton.label;"
-                accesskey="&backButton.accesskey;"
-                observes="canGoBack"
-                oncommand="goBack()"/>
-      <menuitem id="context-forward"
-                label="&forwardButton.label;"
-                accesskey="&forwardButton.accesskey;"
-                observes="canGoForward"
-                oncommand="goForward()"/>
-      <menuseparator/>
-      <menuitem id="context-copy"
-                label="&copyCmd.label;"
-                accesskey="&copyCmd.accesskey;"
-                command="cmd_copy"
-                disabled="true"/>
-      <menuitem id="context-selectall"
-                label="&selectAllCmd.label;"
-                accesskey="&selectAllCmd.accesskey;"
-                command="cmd_selectAll"/>
-      <menuseparator/>
-      <menuitem id="zoom-in"
-      	        label="&fullZoomEnlargeBtn.label;"
-      	        accesskey="&fullZoomEnlargeBtn.accesskey;"
-      	        oncommand="ZoomManager.enlarge();"/>
-      <menuitem id="zoom-out"
-      		label="&fullZoomReduceBtn.label;"
-      		accesskey="&fullZoomReduceBtn.accesskey;"
-      		oncommand="ZoomManager.reduce();"/>
-#ifdef XP_WIN
-#define HELP_ALWAYS_RAISED_TOGGLE
-#endif
-#ifdef HELP_ALWAYS_RAISED_TOGGLE
-      <menuseparator/>
-      <menuitem id="context-zlevel"
-                type="checkbox"
-                checked="true"
-                persist="checked"
-                label="&zLevel.label;"
-                accesskey="&zLevel.accesskey;"
-                oncommand="toggleZLevel(this);"/>
-#endif
-    </menupopup>
-  </popupset>
-</overlay>
deleted file mode 100644
--- a/toolkit/components/help/content/platformClasses.css
+++ /dev/null
@@ -1,13 +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/. */
-
-%ifdef XP_WIN
-.noWin, .mac, .unix { display: none; } 
-%else
-%ifdef XP_MACOSX
-.noMac, .win, .unix { display: none; }
-%else
-.noUnix, .win, .mac { display: none; }
-%endif
-%endif
deleted file mode 100644
--- a/toolkit/components/help/jar.mn
+++ /dev/null
@@ -1,11 +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/.
-
-toolkit.jar:
-% content help %content/help/
-* content/help/help.xul                 (content/help.xul)
-* content/help/contextHelp.js           (content/contextHelp.js)
-* content/help/help.js                  (content/help.js)
-* content/help/helpContextOverlay.xul   (content/helpContextOverlay.xul)
-* content/help/platformClasses.css      (content/platformClasses.css)
deleted file mode 100644
--- a/toolkit/components/help/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
-
-with Files('**'):
-    BUG_COMPONENT = ('Toolkit', 'Help Viewer')
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -79,19 +79,16 @@ if CONFIG['MOZ_SOCIAL']:
     DIRS += ['social']
 
 if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']
 
 if CONFIG['MOZ_FEEDS']:
     DIRS += ['feeds']
 
-if CONFIG['MOZ_HELP_VIEWER']:
-    DIRS += ['help']
-
 if CONFIG['MOZ_XUL']:
     DIRS += ['autocomplete', 'satchel']
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     DIRS += ['search']
 
 if CONFIG['MOZ_URL_CLASSIFIER']:
     DIRS += ['url-classifier']
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/help-toc.rdf
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:nc="http://home.netscape.com/NC-rdf#">
-
-  <rdf:Description about="urn:root">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help" nc:name="Using the Help Window"
-                  nc:link="chrome://help/locale/welcome.xhtml"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-  <rdf:Description about="#use-help">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help-finding-the-topic-you-want" nc:name="Finding the Topic You Want"
-                  nc:link="chrome://help/locale/welcome.xhtml#finding_the_topic_you_want"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="use-help-search" nc:name="Search Tips"
-                  nc:link="chrome://help/locale/welcome.xhtml#search_tips"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-</rdf:RDF>
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
+++ /dev/null
@@ -1,56 +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 printCmd.commandkey            "p">
-
-<!ENTITY findOnCmd.commandkey           "F">
-<!ENTITY findAgainCmd.commandkey        "G">
-<!ENTITY findAgainCmd.commandkey2       "VK_F3">
-
-<!ENTITY backButton.label               "Back">
-<!ENTITY backButton.accesskey           "B">
-<!ENTITY backButton.tooltip             "Go back one page">
-<!ENTITY forwardButton.label            "Forward">
-<!ENTITY forwardButton.accesskey        "F">
-<!ENTITY forwardButton.tooltip          "Go forward one page">
-<!ENTITY copyCmd.label                  "Copy">
-<!ENTITY copyCmd.accesskey              "C">
-<!ENTITY selectAllCmd.label             "Select All">
-<!ENTITY selectAllCmd.accesskey         "A">
-<!ENTITY goBackCmd.commandkey           "[">
-<!ENTITY goForwardCmd.commandkey        "]">
-<!ENTITY homeButton.label               "Home">
-<!ENTITY homeButton.tooltip             "Go to the Help Start Page">
-<!ENTITY printButton.label              "Print">
-<!ENTITY printButton.tooltip            "Print this page">
-<!ENTITY closeWindow.commandkey         "W">
-
-<!ENTITY search.emptytext               "Search">
-<!ENTITY searchHeader.label             "Search results">
-<!ENTITY toctab.label                   "Contents">
-<!ENTITY toctab.accesskey               "C">
-
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
-<!ENTITY fullZoomReduceCmd.commandkey2  "">
-<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
-<!ENTITY fullZoomResetCmd.commandkey    "0">
-<!ENTITY fullZoomResetCmd.commandkey2   "">
-
-<!ENTITY helpSearch.commandkey          "k">
-
-<!ENTITY zLevel.label                   "Always on Top">
-<!ENTITY zLevel.accesskey               "T">
-
-<!ENTITY fullZoomReduceBtn.label        "Zoom Out">
-<!ENTITY fullZoomReduceBtn.accesskey    "O">
-<!ENTITY fullZoomEnlargeBtn.label       "Zoom In">
-<!ENTITY fullZoomEnlargeBtn.accesskey   "I">
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/help.properties
+++ /dev/null
@@ -1,5 +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/.
-
-emptySearchText=No search items found.
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/welcome.xhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-    %brandDTD;
-]
->
-<!--
-Contributors:
-  R.J. Keller <rlk@trfenv.com> (original author)
-  Jeff Walden <jwalden+code@mit.edu>
-  Steffen Wilberg <steffen.wilberg@web.de>
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Using the Help Window</title>
-  <link rel="stylesheet" type="text/css" href="chrome://help/skin/helpFileLayout.css"/>
-</head>
-
-<body>
-
-<h1 id="help_window_top">Using the Help Window</h1>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#finding_the_topic_you_want">Finding the Topic You Want</a></li>
-    <li><a href="#search_tips">Search Tips</a></li>
-  </ul>
-</div>
-
-<h2 id="finding_the_topic_you_want">Finding the Topic You Want</h2>
-
-<p>To display help information in this window, click a topic in the
-  <em>Contents</em> sidebar. Click the <span class="noMac">plus icon</span>
-  <span class="mac">triangle</span> next to a topic to see its subtopics.</p>
-
-<p>To search for a help topic, type a word or phrase in the <em>Search</em> bar
-  to see related topics. Click on a topic to read about it. If your search
-  doesn't return any topics, try typing fewer words or a different combination
-  of words. The results will be displayed in the sidebar as you type. To
-  display the contents in the sidebar again, clear the <em>Search</em> bar or
-  press <kbd>Esc</kbd>.</p>
-
-<p>To see information related to the Help topic you are reading, click links in
-  the Help window just as you would in a regular web page.  You can also move
-  back and forth between pages you've already seen using the Back and Forward
-  buttons.</p>
-
-<h2 id="search_tips">Search Tips</h2>
-
-<p>If you don't find what you want, here are a few helpful tips:</p>
-
-<ul>
-  <li>Be sure that you are searching for something that relates to
-    &brandShortName;; this is not a general Internet search.</li>
-  <li>Try to broaden your search - don't be too specific; terms could be worded
-    differently than your search.</li>
-  <li>Avoid being too broad with your search.  For example, a common word like
-    &quot;page&quot; will likely return more topics than you want.</li>
-</ul>
-
-</body>
-</html>
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -133,18 +133,11 @@
 #endif
 % locale formautofill @AB_CD@ %locale/@AB_CD@/formautofill/
   locale/@AB_CD@/formautofill/requestAutocomplete.dtd (%chrome/formautofill/requestAutocomplete.dtd)
 % locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/
   locale/@AB_CD@/passwordmgr/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties)
   locale/@AB_CD@/passwordmgr/passwordManager.dtd    (%chrome/passwordmgr/passwordManager.dtd)
 % locale autoconfig @AB_CD@ %locale/@AB_CD@/autoconfig/
   locale/@AB_CD@/autoconfig/autoconfig.properties   (%chrome/autoconfig/autoconfig.properties)
-#ifdef MOZ_HELP_VIEWER
-% locale help @AB_CD@ %locale/@AB_CD@/help/
-  locale/@AB_CD@/help/help.properties                     (%chrome/mozapps/help/help.properties)
-  locale/@AB_CD@/help/help.dtd                            (%chrome/mozapps/help/help.dtd)
-  locale/@AB_CD@/help/help-toc.rdf                        (%chrome/mozapps/help/help-toc.rdf)
-  locale/@AB_CD@/help/welcome.xhtml                       (%chrome/mozapps/help/welcome.xhtml)
-#endif
 % locale places @AB_CD@ %locale/@AB_CD@/places/
   locale/@AB_CD@/places/places.properties                 (%chrome/places/places.properties)
   locale/@AB_CD@/global/search/search.properties          (%chrome/search/search.properties)
deleted file mode 100644
--- a/toolkit/themes/linux/help/help.css
+++ /dev/null
@@ -1,134 +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/. */
-
-@import url("chrome://global/skin/");
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#HelpToolbar toolbarbutton {
-  -moz-box-orient: horizontal !important;
-  min-width: 0px;
-  margin: 0 !important;
-  padding: 4px 5px;
-}
-
-#help-back-button {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar");
-}
-
-#help-back-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
-}
-
-#help-back-button:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
-}
-
-#help-back-button[disabled="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
-}
-
-#help-forward-button {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar");
-}
-
-#help-forward-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
-}
-
-#help-forward-button:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
-}
-
-#help-forward-button[disabled="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
-}
-
-#help-home-button {
-  list-style-image: url("moz-icon://stock/gtk-home?size=toolbar");
-}
-
-#help-home-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-home?size=toolbar&state=disabled");
-}
-
-#help-print-button {
-  list-style-image: url("moz-icon://stock/gtk-print?size=toolbar");
-}
-
-#help-print-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-print?size=toolbar&state=disabled");
-}
-
-/* Hide labels for the toolbar because we really don't need them what with the
-   tooltips */
-#HelpToolbar .toolbarbutton-text {
-  display: none;
-}
-
-/* With no labels, we don't need the margin on the icon that separates it
-   from the label */
-#HelpToolbar .toolbarbutton-icon {
-  margin-inline-end: 0;
-}
-
-/* Set the minimum sidebar width so the help contents aren't squeezed together.*/
-#help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
-
-#context-copy[disabled="true"] {
-  display: none;
-}
-
-/**** menuitem stock icons ****/
-menuitem:not([type]) {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
-}
-
-#context-back {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
-}
-
-#context-back:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
-}
-
-#context-back[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
-}
-
-#context-back[disabled="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
-}
-
-#context-forward {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
-}
-
-#context-forward:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
-}
-
-#context-forward[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
-}
-
-#context-forward[disabled="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
-}
-
-#context-copy {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
-}
-
-#context-selectall {
-  list-style-image: url("moz-icon://stock/gtk-select-all?size=menu");
-}
-
-#zoom-in {
-  list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu");
-}
-
-#zoom-out {
-  list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu");
-}
-
deleted file mode 100644
--- a/toolkit/themes/linux/help/jar.mn
+++ /dev/null
@@ -1,6 +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/.
-
-toolkit.jar:
-  skin/classic/help/help.css
deleted file mode 100644
--- a/toolkit/themes/linux/help/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
--- a/toolkit/themes/linux/moz.build
+++ b/toolkit/themes/linux/moz.build
@@ -1,10 +1,8 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 DIRS += ['global', 'mozapps']
 
-if CONFIG['MOZ_HELP_VIEWER']:
-    DIRS += ['help']
deleted file mode 100644
index 165a2c1f94aa13c11208da82e59d2fbe5e5bffc6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4022fb8e90c0af4f7da247cc45933e129edbdde3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e841574c399b999c1df52258c465b3edc20323c8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/themes/osx/help/help.css
+++ /dev/null
@@ -1,102 +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/. */
-
-@import url("chrome://global/skin/");
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#HelpToolbar {
-  padding-inline-start: 5px;
-}
-
-#HelpToolbar toolbarbutton {
-  min-width: 0px;
-  list-style-image: url("chrome://help/skin/Toolbar.png");
-  -moz-box-orient: horizontal !important;
-}
-
-#HelpToolbar toolbarbutton[type="menu-button"] {
-  margin: 0px;
-  padding: 0px;
-}
-
-/* this element contains the icon and the label */
-#HelpToolbar .toolbarbutton-menubutton-button {
-  margin: 0px !important;
-  padding: 0px !important;
-  border: 0px !important;
-}
-
-/* Hide labels for the toolbar because we really don't need them what with the
-   tooltips */
-#HelpToolbar .toolbarbutton-text {
-  display: none;
-}
-
-/* Set the minimum sidebar width so the help contents aren't squeezed together.*/
-#help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
-
-#help-back-button { -moz-image-region: rect(0px 24px 24px 0px); }
-#help-back-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 24px 48px 0px); }
-#help-back-button[disabled="true"] { -moz-image-region: rect(48px 24px 72px 0px); }
-#help-back-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 24px 96px 0px); }
-
-#help-forward-button { -moz-image-region: rect(0px 48px 24px 24px); }
-#help-forward-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 48px 48px 24px); }
-#help-forward-button[disabled="true"] { -moz-image-region: rect(48px 48px 72px 24px); }
-#help-forward-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 48px 96px 24px); }
-
-#help-home-button { -moz-image-region: rect(0px 72px 24px 48px); }
-#help-home-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 72px 48px 48px); }
-#help-home-button[disabled="true"] { -moz-image-region: rect(48px 72px 72px 48px); }
-#help-home-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 72px 96px 48px); }
-
-#help-print-button { -moz-image-region: rect(0px 96px 24px 72px); }
-#help-print-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 96px 48px 72px); }
-#help-print-button[disabled="true"] { -moz-image-region: rect(48px 96px 72px 72px); }
-#help-print-button:not([disabled="true"]):hover:active { -moz-image-region: rect(72px 96px 96px 72px); }
-
-/* Style the back/forward dropmarks to connect them to the buttons */
-
-/* Style the back dropmark */
-
-#help-back-button > .toolbarbutton-menubutton-dropmarker {
-  margin-top: 3px;
-  list-style-image: url("chrome://help/skin/dropmark-nav.png");
-  -moz-image-region: rect(0px, 14px, 24px, 0px);
-}
-
-#help-back-button:hover > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(24px, 14px, 48px, 0px);
-}
-
-#help-back-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://help/skin/dropmark-nav.png") !important;
-  -moz-image-region: rect(48px, 14px, 72px, 0px) !important;
-}
-
-#help-back-button:hover:active > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(72px, 14px, 96px, 0px);
-}
-
-/* Style the forward dropmark */
-
-#help-forward-button > .toolbarbutton-menubutton-dropmarker {
-  margin-top: 3px;
-  list-style-image: url("chrome://help/skin/dropmark-nav.png");
-  -moz-image-region: rect(0px, 14px, 24px, 0px);
-}
-#help-forward-button:hover > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(24px, 14px, 48px, 0px);
-}
-#help-forward-button[disabled="true"] > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://help/skin/dropmark-nav.png") !important;
-  -moz-image-region: rect(48px, 14px, 72px, 0px) !important;
-}
-#help-forward-button:hover:active > .toolbarbutton-menubutton-dropmarker {
-  -moz-image-region: rect(72px, 14px, 96px, 0px);
-}
-
-#helpsidebar-splitter {
-  border-right: 1px solid #bebebe;
-}
deleted file mode 100644
--- a/toolkit/themes/osx/help/helpFileLayout.css
+++ /dev/null
@@ -1,157 +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/. */
-
-@import url('chrome://help/content/platformClasses.css');
-
-body,
-td,
-th,
-input {
-  font-family: verdana, sans-serif;
-  font-size: small;
-}
-
-body {
-  margin: 2ex;
-  max-width: 120ex;
-}
-
-:link:hover,
-:visited:hover {
-  color: -moz-activehyperlinktext;
-}
-
-hr {
-  height: 1px;
-  background-color: #000;
-  color: #000;
-  margin: 2em 0;
-}
-
-a[href^="http://"]:after,
-a[href^="https://"]:after {
-  content: url('chrome://help/skin/Weblink.png');
-}
-
-:link {
-  color: #039;
-}
-:visited {
-  color: #636;
-}
-:link:hover,
-:visited:hover {
-  color: #333;
-}
-:link:active,
-:link:active {
-  color: #000;
-}
-
-h1 {
-  font-size: 160%;
-  font-weight: normal;
-}
-h2 {
-  font-size: 150%;
-  font-weight: normal;
-}
-h3 {
-  font-size: 120%;
-}
-h4 {
-  font-size: 100%;
-}
-h5 {
-  font-size: 90%;
-}
-h6 {
-  font-size: 90%;
-  border: 0;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 1em 0 .2em;
-  border-bottom: 1px solid #ccc;
-  font-family: arial, verdana, sans-serif;
-}
-
-li h1,
-li h2,
-li h3,
-li h4,
-li h5,
-li h6 {
-  border: none;
-}
-
-
-dt {
-  font-weight: bold;
-}
-
-sup {
-  font-size: 70%;
-}
-
-:link img,
-:visited img {
-  border: 0;
-}
-
-.contentsBox, 
-.contentsBox > ul,
-li {
-  text-indent: 0;
-}
-
-.contentsBox > ul,
-.contentsBox ul > ul {
-  margin: 0;
-  list-style-type: none;
-}
-
-.contentsBox {
-  margin-top: 12px;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  width: 300px;
-  padding: 1em;
-}
-
-.menuPath {
-  background: #c4d0f4; /* bluish color */
-  color: inherit;
-  padding-left:  1px; /* else bgcolor ends at last char - no space */
-  padding-right: 1px;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-td,
-th {
-  border: 1px solid #ddd;
-  padding: 6px;
-  vertical-align: top;
-}
-
-th {
-  background-color: #eee;
-  font-weight: bold;
-  text-align: start;
-}
-
-.noTableBorder,
-.noTableBorder td,
-.noTableBorder th {
-  background-color: transparent;
-  border: none;
-}
deleted file mode 100644
--- a/toolkit/themes/osx/help/jar.mn
+++ /dev/null
@@ -1,10 +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/.
-
-toolkit.jar:
-  skin/classic/help/dropmark-nav.png
-  skin/classic/help/help.css
-  skin/classic/help/Toolbar.png
-  skin/classic/help/helpFileLayout.css
-  skin/classic/help/Weblink.png
deleted file mode 100644
--- a/toolkit/themes/osx/help/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
--- a/toolkit/themes/osx/moz.build
+++ b/toolkit/themes/osx/moz.build
@@ -1,12 +1,9 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 DIRS += ['global', 'mozapps']
 
-if CONFIG['MOZ_HELP_VIEWER']:
-    DIRS += ['help']
-
 MOCHITEST_CHROME_MANIFESTS += ['mochitests/chrome.ini']
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -124,22 +124,16 @@
   skin/classic/global/toolbar/chevron.gif                  (../../windows/global/toolbar/chevron.gif)
   skin/classic/global/toolbar/chevron-inverted.png         (../../windows/global/toolbar/chevron-inverted.png)
   skin/classic/global/tree/columnpicker.gif                (../../windows/global/tree/columnpicker.gif)
   skin/classic/global/tree/sort-asc.png                    (../../windows/global/tree/sort-asc.png)
   skin/classic/global/tree/sort-dsc.png                    (../../windows/global/tree/sort-dsc.png)
   skin/classic/global/tree/sort-asc-classic.png            (../../windows/global/tree/sort-asc-classic.png)
   skin/classic/global/tree/sort-dsc-classic.png            (../../windows/global/tree/sort-dsc-classic.png)
 
-  skin/classic/help/Toolbar.png                            (../../windows/help/Toolbar.png)
-  skin/classic/help/Toolbar-rtl.png                        (../../windows/help/Toolbar-rtl.png)
-  skin/classic/help/helpFileLayout.css                     (../../windows/help/helpFileLayout.css)
-  skin/classic/help/Weblink.png                            (../../windows/help/Weblink.png)
-  skin/classic/help/Weblink-rtl.png                        (../../windows/help/Weblink-rtl.png)
-
   skin/classic/mozapps/downloads/downloadButtons.png         (../../windows/mozapps/downloads/downloadButtons.png)
   skin/classic/mozapps/downloads/unknownContentType.css      (../../windows/mozapps/downloads/unknownContentType.css)
   skin/classic/mozapps/extensions/about.css                  (../../windows/mozapps/extensions/about.css)
   skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/extensions/blocklist.css)
   skin/classic/mozapps/extensions/update.css                 (../../windows/mozapps/extensions/update.css)
   skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/extensions/discover-logo.png)
   skin/classic/mozapps/extensions/experimentGeneric.png      (../../windows/mozapps/extensions/experimentGeneric.png)
   skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/extensions/rating-won.png)
deleted file mode 100644
index ddcdc4d7d25555519faa2cb9dc11e6cc3146e80b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 58b9405911606ebb516bef85ef8d12e5082976e4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4cf3ea2cab44314d91dd2f146637af17b77f96fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bf201d64f8d035d1b8eb05525f44f63790f4c0e0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/themes/windows/help/help.css
+++ /dev/null
@@ -1,115 +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/. */
-
-@import url("chrome://global/skin/");
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#HelpToolbar toolbarbutton {
-  -moz-box-orient: horizontal !important;
-  min-width: 0px;
-  list-style-image: url("chrome://help/skin/Toolbar.png");
-  margin: 0 !important;
-  padding: 4px 5px;
-}
-
-#HelpToolbar:-moz-locale-dir(rtl) toolbarbutton {
-  list-style-image: url("chrome://help/skin/Toolbar-rtl.png");
-}
-
-/* Hide labels for the toolbar because we really don't need them what with the
-   tooltips */
-#HelpToolbar .toolbarbutton-text {
-  display: none;
-}
-
-/* With no labels, we don't need the margin on the icon that separates it
-   from the label */
-#HelpToolbar .toolbarbutton-icon {
-  margin-inline-end: 0;
-}
-
-/* Set the minimum sidebar width so the help contents aren't squeezed together.*/
-#help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
-
-/* ----- BACK BUTTON ----- */
-
-#help-back-button {
-  -moz-image-region: rect(0px 24px 24px 0px); 
-}
-
-#help-back-button:not([disabled="true"]):hover { 
-  -moz-image-region: rect(24px 24px 48px 0px); 
-}
-
-#help-back-button[disabled="true"] { 
-  -moz-image-region: rect(48px 24px 72px 0px); 
-}
-
-#help-back-button:not([disabled="true"]):hover:active { 
-  -moz-image-region: rect(72px 24px 96px 0px); 
-}
-
-#help-back-button .toolbarbutton-menubutton-button {
-  -moz-box-align: end !important;
-}
-
-/* ----- FORWARD BUTTON ----- */
-
-#help-forward-button {
-  -moz-image-region: rect(0px 48px 24px 24px); 
-}
-
-#help-forward-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(24px 48px 48px 24px); 
-}
-
-#help-forward-button[disabled="true"] {
-  -moz-image-region: rect(48px 48px 72px 24px); 
-}
-
-#help-forward-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(72px 48px 96px 24px); 
-}
-
-/* ----- HOME BUTTON ----- */
-
-#help-home-button { 
-  -moz-image-region: rect(0px 72px 24px 48px); 
-}
-
-#help-home-button:not([disabled="true"]):hover { 
-  -moz-image-region: rect(24px 72px 48px 48px); 
-}
-
-#help-home-button[disabled="true"] { 
-  -moz-image-region: rect(48px 72px 72px 48px); 
-}
-
-#help-home-button:not([disabled="true"]):hover:active { 
-  -moz-image-region: rect(72px 72px 96px 48px); 
-}
-
-/* ----- PRINT BUTTON ----- */
-
-#help-print-button { 
-  -moz-image-region: rect(0px 96px 24px 72px); 
-}
-
-#help-print-button:not([disabled="true"]):hover { 
-  -moz-image-region: rect(24px 96px 48px 72px); 
-}
-
-#help-print-button[disabled="true"] { 
-  -moz-image-region: rect(48px 96px 72px 72px); 
-}
-
-#help-print-button:not([disabled="true"]):hover:active { 
-  -moz-image-region: rect(72px 96px 96px 72px); 
-}
-
-/* ----- OTHER ----- */
-
-#context-copy[disabled="true"] {
-  display: none;
-}
deleted file mode 100644
--- a/toolkit/themes/windows/help/helpFileLayout.css
+++ /dev/null
@@ -1,157 +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/. */
-
-@import url('chrome://help/content/platformClasses.css');
-
-body,
-td,
-th,
-input {
-  font-family: verdana, sans-serif;
-  font-size: small;
-}
-
-body {
-  margin: 2ex;
-  max-width: 120ex;
-}
-
-:link:hover,
-:visited:hover {
-  color: -moz-activehyperlinktext;
-}
-
-hr {
-  height: 1px;
-  background-color: #000;
-  color: #000;
-  margin: 2em 0;
-}
-
-a[href^="http://"]:after,
-a[href^="https://"]:after {
-  content: url('chrome://help/skin/Weblink.png');
-}
-
-:link {
-  color: #039;
-}
-:visited {
-  color: #636;
-}
-:link:hover,
-:visited:hover {
-  color: #333;
-}
-:link:active,
-:link:active {
-  color: #000;
-}
-
-h1 {
-  font-size: 160%;
-  font-weight: normal;
-}
-h2 {
-  font-size: 150%;
-  font-weight: normal;
-}
-h3 {
-  font-size: 120%;
-}
-h4 {
-  font-size: 100%;
-}
-h5 {
-  font-size: 90%;
-}
-h6 {
-  font-size: 90%;
-  border: 0;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 1em 0 .2em;
-  border-bottom: 1px solid #ccc;
-  font-family: arial, verdana, sans-serif;
-}
-
-li h1,
-li h2,
-li h3,
-li h4,
-li h5,
-li h6 {
-  border: none;
-}
-
-
-dt {
-  font-weight: bold;
-}
-
-sup {
-  font-size: 70%;
-}
-
-:link img,
-:visited img {
-  border: 0;
-}
-
-.contentsBox, 
-.contentsBox > ul,
-li {
-  text-indent: 0;
-}
-
-.contentsBox > ul,
-.contentsBox ul > ul {
-  margin: 0;
-  list-style-type: none;
-}
-
-.contentsBox {
-  margin-top: 12px;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  width: 300px;
-  padding: 1em;
-}
-
-.menuPath {
-  background: #c4d0f4; /* bluish color */
-  color: inherit;
-  padding-left:  1px; /* else bgcolor ends at last char - no space */
-  padding-right: 1px;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-td,
-th {
-  border: 1px solid #ddd;
-  padding: 6px;
-  vertical-align: top;
-}
-
-th {
-  background-color: #eee;
-  font-weight: bold;
-  text-align: start;
-}
-
-.noTableBorder,
-.noTableBorder td,
-.noTableBorder th {
-  background-color: transparent;
-  border: none;
-}
deleted file mode 100644
--- a/toolkit/themes/windows/help/jar.mn
+++ /dev/null
@@ -1,6 +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/.
-
-toolkit.jar:
-  skin/classic/help/help.css
deleted file mode 100644
--- a/toolkit/themes/windows/help/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
--- a/toolkit/themes/windows/moz.build
+++ b/toolkit/themes/windows/moz.build
@@ -1,10 +1,8 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 DIRS += ['global', 'mozapps']
 
-if CONFIG['MOZ_HELP_VIEWER']:
-    DIRS += ['help']