From f2cf6a77232a2a1032181d62dfc1e575a546fa40 Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at>
Date: Wed, 1 Nov 2006 17:07:23 +0000
Subject: [PATCH] bug 344243 - move suiterunner help over to toolkit help
 viewer (and build toolkit typeaheadfind), r=bsmedberg on configure.in change,
 r=Neil for the rest, sr=Neil

---
 configure.in                                  |  11 +-
 suite/browser/browser-prefs.js                |   3 +
 suite/common/helpSecurityOverlay.xul          | 181 ++++++++++++++++++
 suite/common/jar.mn                           |  25 ++-
 suite/common/utilityOverlay.xul               |  35 ++++
 .../en-US/chrome/common/help/suitehelp.rdf    |  68 ++++---
 .../en-US/chrome/common/utilityOverlay.dtd    |   4 +-
 toolkit/components/Makefile.in                |   9 +-
 toolkit/components/build/Makefile.in          |   3 -
 .../components/build/nsToolkitCompsModule.cpp |   6 +-
 10 files changed, 301 insertions(+), 44 deletions(-)
 create mode 100644 suite/common/helpSecurityOverlay.xul

diff --git a/configure.in b/configure.in
index 81e01dbf4f7..14f91951fce 100644
--- a/configure.in
+++ b/configure.in
@@ -4266,7 +4266,11 @@ suite)
   MOZ_SUITE=1
   MOZ_PROFILESHARING=
   MOZ_APP_VERSION=$SEAMONKEY_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc help p3p venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
+  if test "$MOZ_XUL_APP"; then
+    MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc p3p venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
+  else
+    MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc help p3p venkman inspector irc typeaheadfind gnomevfs sroaming reporter"
+  fi
   AC_DEFINE(MOZ_SUITE)
   ;;
 
@@ -5548,6 +5552,11 @@ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman`
     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
 fi
 
+if test "$MOZ_XUL_APP" && test `echo "$MOZ_EXTENSIONS" | grep -c help` -ne 0; then
+    AC_MSG_WARN([Cannot build old help extension with MOZ_XUL_APP set. Removing help from MOZ_EXTENSIONS.])
+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|help||'`
+fi
+
 dnl This might be temporary: build tridentprofile only on Windows
 if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then
     AC_MSG_WARN([tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS.])
diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
index 26f2c6a6b45..53462903ddb 100644
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -199,6 +199,9 @@ pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla
 // 2 = check multi/single line controls
 pref("layout.spellcheckDefault", 1);
 
+// special TypeAheadFind settings
+pref("accessibility.typeaheadfind.flashBar", 0);
+
 // App-specific update preferences
 
 // Whether or not app updates are enabled - false initally for SeaMonkey
diff --git a/suite/common/helpSecurityOverlay.xul b/suite/common/helpSecurityOverlay.xul
new file mode 100644
index 00000000000..a043f51d4c3
--- /dev/null
+++ b/suite/common/helpSecurityOverlay.xul
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is SeaMonkey internet suite code.
+   -
+   - The Initial Developer of the Original Code is
+   - Mark Banner <bugzilla@standard8.demon.co.uk>
+   - Portions created by the Initial Developer are Copyright (C) 2006
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<overlay id="securityManagerOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/x-javascript">
+  <![CDATA[
+    setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
+
+    function doCertManagerHelpButton()
+    {
+      var selTab = document.getElementById('certMgrTabbox').selectedItem;
+      var selTabID = selTab.getAttribute('id');
+      switch (selTabID) {
+        case 'mine_tab':
+          openHelp("my_certs");
+          break;
+        case 'others_tab':
+          openHelp("others_certs");
+          break;
+        case 'websites_tab':
+          openHelp("web_certs");
+          break;
+        case 'ca_tab':
+          openHelp("ca_certs");
+          break;
+      }
+    }
+
+    function doDeleteCertificateHelpButton()
+    {
+      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+      switch (gParams.GetString(0)) {
+        case bundle.GetStringFromName("deleteUserCertFlag"):
+          openHelp("delete_my_certs");
+          break;
+        case bundle.GetStringFromName("deleteSslCertFlag"):
+          openHelp("delete_web_certs");
+          break;
+        case bundle.GetStringFromName("deleteCaCertFlag"):
+          openHelp("delete_ca_certs");
+          break;
+        case bundle.GetStringFromName("deleteEmailCertFlag"):
+          openHelp("delete_email_certs");
+          break;
+      }
+    }
+  ]]>
+  </script>
+
+  <dialog id="certmanager"
+          buttons="accept,help"
+          ondialoghelp="return doCertManagerHelpButton();"/>
+
+  <dialog id="certDetails"
+          buttons="accept,help"
+          ondialoghelp="openHelp('cert_details');"/>
+
+  <dialog id="set_password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('change_pwd');"/>
+
+  <dialog id="devicemanager"
+          buttons="accept,help"
+          ondialoghelp="openHelp('sec_devices');"/>
+
+  <dialog id="ssl_warning"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('which_token');"/>
+
+  <dialog id="certAuthAsk"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('which_cert');"/>
+
+  <dialog id="crlImportSuccess"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('validation-crl-import');"/>
+
+  <dialog id="deleteCertificate"
+          buttons="accept,cancel,help"
+          ondialoghelp="doDeleteCertificateHelpButton();"/>
+
+  <dialog id="domainMismatch"
+          spacerflex="1"
+          buttons="accept,cancel,help,extra2"
+          ondialoghelp="openHelp('bad_name_web_cert');"/>
+
+  <dialog id="editCaCert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('edit_ca_certs');"/>
+
+  <dialog id="editEmailCert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('edit_email_certs');"/>
+
+  <dialog id="editWebsiteCert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('edit_web_certs');"/>
+
+  <dialog id="escrowWarnDialog"
+          spacerflex="1"
+          buttons="accept,cancel,help,extra2"
+          ondialoghelp="openHelp('priv_key_copy');"/>
+
+  <dialog id="getp12password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('my_certs');"/>
+
+  <dialog id="setp12password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('cert_backup_pwd');"/>
+
+  <dialog id="newServerDialog"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('new_web_cert');"/>
+
+  <dialog id="crlUpdatePref"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('validation-crl-auto-update-prefs');"/>
+
+  <dialog id="serverCertExpired"
+          spacerflex="1"
+          buttons="accept,cancel,help,extra2"
+          ondialoghelp="openHelp('exp_web_cert');"/>
+
+  <dialog id="serverCrlNextupdate"
+          buttons="accept,help"
+          ondialoghelp="openHelp('exp_crl');"/>
+
+  <dialog id="crlviewer"
+          buttons="help"
+          ondialoghelp="openHelp('validation-crl-manage');">
+    <hbox id="dialogButtons">
+      <button dlgtype="help"/>
+    </hbox>
+  </dialog>
+
+  <dialog id="reset_password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('reset_pwd');"/>
+
+  <dialog id="download_cert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('new_ca');"/>
+</overlay>
diff --git a/suite/common/jar.mn b/suite/common/jar.mn
index b0f21159e1f..1fd53ba253f 100644
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -8,6 +8,28 @@ comm.jar:
 % overlay chrome://global/content/console.xul chrome://communicator/content/consoleOverlay.xul
 % overlay chrome://communicator/content/tasksOverlay.xul chrome://communicator/content/emOverlay.xul
 % overlay chrome://communicator/content/pref/preftree.xul chrome://pippki/content/PrefOverlay.xul
+% overlay chrome://pippki/content/certManager.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/certViewer.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/changepassword.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/device_manager.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/choosetoken.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/clientauthask.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/crlImportDialog.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/deletecert.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/domainMismatch.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/editcacert.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/editemailcert.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/editsslcert.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/escrowWarn.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/getp12password.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/setp12password.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/newserver.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/pref-crlupdate.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/serverCertExpired.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/serverCrlNextupdate.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/crlManager.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/resetpassword.xul chrome://communicator/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/downloadcert.xul chrome://communicator/content/helpSecurityOverlay.xul
 % content communicator-platform %content/communicator-platform/ platform xpcnativewrappers=yes
 % content communicator-region %content/communicator-region/ xpcnativewrappers=yes
 #else
@@ -27,6 +49,7 @@ comm.jar:
    content/communicator/editorBindings.xul
    content/communicator/emOverlay.xul
    content/communicator/findUtils.js
+   content/communicator/helpSecurityOverlay.xul
    content/communicator/nsContextMenu.js
    content/communicator/openLocation.js
    content/communicator/openLocation.xul
@@ -35,7 +58,7 @@ comm.jar:
    content/communicator/tasksOverlay.js
    content/communicator/tasksOverlay.xul
    content/communicator/utilityOverlay.js
-   content/communicator/utilityOverlay.xul
+*  content/communicator/utilityOverlay.xul
    content/communicator/viewZoomOverlay.xul
    content/communicator/viewZoomOverlay.js
 #ifdef XP_MACOSX
diff --git a/suite/common/utilityOverlay.xul b/suite/common/utilityOverlay.xul
index 928ed478e08..c0be4da0089 100644
--- a/suite/common/utilityOverlay.xul
+++ b/suite/common/utilityOverlay.xul
@@ -8,6 +8,8 @@
 %brandDTD;
 <!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
 %globalRegionDTD;
+<!ENTITY % platformCommunicatorDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
+%platformCommunicatorDTD;
 <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD;
 
@@ -20,6 +22,10 @@
           src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript"
           src="chrome://communicator/content/utilityOverlay.js"/>
+#ifdef MOZ_XUL_APP
+  <script type="application/x-javascript"
+          src="chrome://help/content/contextHelp.js"/>
+#endif
 
   <!-- online/offline status indicators -->   
   <broadcaster id="Communicator:WorkMode"
@@ -220,6 +226,11 @@
               events="focus"
               oncommandupdate="goUpdateFindTypeMenuItems()"/>
 
+  <commandset id="tasksCommands">
+    <command id="cmd_openHelp"
+             oncommand="openHelp('welcome', 'chrome://communicator/locale/help/suitehelp.rdf');"/>
+  </commandset>
+
   <command id="cmd_copyLink"
            oncommand="goDoCommand('cmd_copyLink')"
            disabled="false"/>
@@ -284,6 +295,30 @@
         label="&helpMenu.label;"
         accesskey="&helpMenu.accesskey;">
     <menupopup id="helpPopup">
+#ifdef MOZ_XUL_APP
+      <menuitem label="&openHelpCmd.label;"
+                accesskey="&openHelpCmd.accesskey;"
+                id="help"
+                key="key_openHelp"
+                command="cmd_openHelp"/>
+#ifdef XP_WIN
+#define DISPLAY_IE_USERS_HELP_MENU_ITEM
+#endif
+#ifdef XP_MACOSX
+#define DISPLAY_IE_USERS_HELP_MENU_ITEM
+#endif
+#ifdef HPUX
+#define DISPLAY_IE_USERS_HELP_MENU_ITEM
+#endif
+#ifdef SOLARIS
+#define DISPLAY_IE_USERS_HELP_MENU_ITEM
+#endif
+#ifdef DISPLAY_IE_USERS_HELP_MENU_ITEM
+      <menuitem label="&helpForIEUsers.label;"
+                accesskey="&helpForIEUsers.accesskey;"
+                oncommand="openHelp('ieusers', 'chrome://communicator/locale/help/suitehelp.rdf');" />
+#endif
+#endif
       <menuitem accesskey="&releaseCmd.accesskey;"
                 label="&releaseCmd.label;"
                 id="releaseUrl"
diff --git a/suite/locales/en-US/chrome/common/help/suitehelp.rdf b/suite/locales/en-US/chrome/common/help/suitehelp.rdf
index 6621ddf5c3d..c20badcba3a 100755
--- a/suite/locales/en-US/chrome/common/help/suitehelp.rdf
+++ b/suite/locales/en-US/chrome/common/help/suitehelp.rdf
@@ -1,30 +1,44 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE rdf:RDF SYSTEM "chrome://branding/locale/brand.dtd" >
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:nc="http://home.netscape.com/NC-rdf#">
-
-<!-- MASTER HELP DOCUMENT -->
-  <rdf:Description about="urn:root"
-          nc:title="&brandShortName; Help"
-          nc:defaulttopic="welcome"
-          nc:base="chrome://communicator/locale/help/">
-    <nc:panellist>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description nc:panelid="glossary" nc:datasources="help-glossary.rdf"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="index" nc:datasources="help-indexAZ.rdf help-index1.rdf"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="index" nc:datasources="help-win.rdf" nc:platform="win"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="search"
-                    nc:datasources="rdf:null"
-                    nc:emptysearchtext="[No matching items found.]"
-                    nc:emptysearchlink="help_help.xhtml#search_tips"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="toc" nc:datasources="suite-toc.rdf"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="toc" nc:datasources="help-win.rdf" nc:platform="win"/> </rdf:li>
-      </rdf:Seq>
-    </nc:panellist>
-  </rdf:Description>
-</rdf:RDF>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE window [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+    %brandDTD;
+]>
 
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:nc="http://home.netscape.com/NC-rdf#">
 
+    <!-- SEAMONKEY MASTER HELP DOCUMENT -->
+    <Description rdf:about="urn:root"
+            nc:title="&brandFullName; Help"
+            nc:defaulttopic="welcome"
+            nc:base="chrome://communicator/locale/help/">
+        <nc:panellist>
+            <Seq>
+                <li>
+                    <Description nc:panelid="toc"
+                        nc:datasources="chrome://help/locale/help-toc.rdf suite-toc.rdf"/>
+                </li>
+                <li>
+                    <Description nc:panelid="toc" nc:datasources="help-win.rdf" nc:platform="win"/>
+                </li>
+                <li>
+                    <Description nc:panelid="search"
+                        nc:datasources="search-db.rdf"
+                        nc:emptysearchtext="[No matching items found.]"
+                        nc:emptysearchlink="chrome://help/locale/welcome.xhtml#search_tips"/>
+                </li>
+                <li>
+                    <Description nc:panelid="glossary" nc:datasources="help-glossary.rdf"/>
+                </li>
+                <li>
+                    <Description nc:panelid="index" nc:datasources="help-indexAZ.rdf help-index1.rdf"/>
+                </li>
+                <li>
+                    <Description nc:panelid="index" nc:datasources="help-win.rdf" nc:platform="win"/>
+                </li>
+            </Seq>
+        </nc:panellist>
+    </Description>
+</RDF>
diff --git a/suite/locales/en-US/chrome/common/utilityOverlay.dtd b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
index 4d6b3cbd285..42fde114848 100644
--- a/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -61,8 +61,8 @@
 <!ENTITY helpMenu.label					"Help"> 
 <!ENTITY helpMenu.accesskey				"h"> 
 
-<!-- NOTE (whatNewCmd.label): This is not used in Mozilla but is used in Netscape -->
-<!ENTITY whatNewCmd.label				"What's New">  
+<!ENTITY helpForIEUsers.label     "For Internet Explorer Users">
+<!ENTITY helpForIEUsers.accesskey "I">
 
 <!ENTITY releaseCmd.label				"Release Notes">
 <!ENTITY releaseCmd.accesskey                   "N">
diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
index 829278c207b..03d3f679397 100644
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -58,13 +58,8 @@ DIRS += \
 	filepicker \
 	console \
 	viewconfig \
-	$(NULL)
-ifndef MOZ_SUITE
-# XXX Suite doesn't want these just yet
-DIRS += \
 	typeaheadfind \
 	$(NULL)
-endif # MOZ_SUITE
 
 ifdef MOZ_FEEDS
 DIRS += feeds
@@ -102,12 +97,12 @@ endif # MOZ_XUL
 endif # MOZ_SUITE
 endif # MOZ_THUNDERBIRD
 
-ifndef MOZ_SUITE
-# XXX Suite doesn't want these just yet
 ifdef MOZ_XUL
 DIRS += help
 endif
 
+ifndef MOZ_SUITE
+# XXX Suite doesn't want these just yet
 ifdef MOZ_XPINSTALL
 ifdef MOZ_RDF
 DIRS +=	downloads
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
index 984dd2808bc..3210e620f51 100644
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -127,11 +127,8 @@ ifdef MOZ_FEEDS
 SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
 endif
 
-ifndef MOZ_SUITE
-# XXX Suite isn't ready to build this just yet
 SHARED_LIBRARY_LIBS += ../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX)
 EXTRA_DSO_LIBS = gkgfx
-endif
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp
index 5dd4ce3a173..d515dbbfcb1 100644
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/toolkit/components/build/nsToolkitCompsModule.cpp
@@ -52,9 +52,9 @@
 #include "nsDownloadProxy.h"
 #endif
 #endif
+#endif // MOZ_SUITE
 
 #include "nsTypeAheadFind.h"
-#endif // MOZ_SUITE
 
 #ifdef MOZ_URL_CLASSIFIER
 #include "nsUrlClassifierDBService.h"
@@ -82,9 +82,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
 #endif
 #endif
+#endif // MOZ_SUITE
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
-#endif // MOZ_SUITE
 
 #ifdef MOZ_URL_CLASSIFIER
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsUrlClassifierDBService,
@@ -129,12 +129,12 @@ static const nsModuleComponentInfo components[] =
     nsDownloadProxyConstructor },
 #endif
 #endif
+#endif // MOZ_SUITE
   { "TypeAheadFind Component",
     NS_TYPEAHEADFIND_CID,
     NS_TYPEAHEADFIND_CONTRACTID,
     nsTypeAheadFindConstructor
   },
-#endif // MOZ_SUITE
 #ifdef MOZ_URL_CLASSIFIER
   { "Url Classifier DB Service",
     NS_URLCLASSIFIERDBSERVICE_CID,