Bug 128687 - include XBL form control files in embed.jar. This looks like a bigger change than it is because I'm also removing extra ^M's in embed-jar.mn. r=pinkerton, sr=shaver, a=asa.

embedding/config/embed-jar.mn

@@ -1,38 +1,41 @@
-# Specify files or whole directories from the chrome that embedding
-# needs to include.
-#
-# Format is:
-# 
-# <destination in embed.jar>,<source in unzipped chrome>
-#
-# Use XXXX for locale specific parts of the path.
-
-# Stuff needed for key bindings, scroll bar graphics etc.
-content/global, toolkit/content/global
-content/global/bindings, toolkit/content/global/bindings
-content/global-platform, toolkit/content/global-platform
-skin/classic/global, classic/skin/classic/global
-skin/classic/communicator/contents.rdf, classic/skin/classic/communicator/contents.rdf
-skin/classic/communicator/dialogOverlay.css, classic/skin/classic/communicator/dialogOverlay.css
-skin/classic/communicator/smallheader-bg.gif, classic/skin/classic/communicator/smallheader-bg.gif
-
-# Locale stuff
-locale/XXXX/global, XXXX/locale/XXXX/global
-locale/XXXX/necko/contents.rdf, XXXX/locale/XXXX/necko/contents.rdf
-locale/XXXX/necko/necko.properties, XXXX/locale/XXXX/necko/necko.properties
-locale/XXXX/necko/redirect_loop.dtd, XXXX/locale/XXXX/necko/redirect_loop.dtd
-locale/XXXX/communicator/contents.rdf, XXXX/locale/XXXX/communicator/contents.rdf
+# Specify files or whole directories from the chrome that embedding
+# needs to include.
+#
+# Format is:
+# 
+# <destination in embed.jar>,<source in unzipped chrome>
+#
+# Use XXXX for locale specific parts of the path.
+
+# Stuff needed for key bindings, scroll bar graphics etc.
+content/forms, forms/content/forms
+content/global, toolkit/content/global
+content/global/bindings, toolkit/content/global/bindings
+content/global-platform, toolkit/content/global-platform
+skin/classic/forms, classic/skin/classic/forms
+skin/classic/global, classic/skin/classic/global
+skin/classic/communicator/contents.rdf, classic/skin/classic/communicator/contents.rdf
+skin/classic/communicator/dialogOverlay.css, classic/skin/classic/communicator/dialogOverlay.css
+skin/classic/communicator/smallheader-bg.gif, classic/skin/classic/communicator/smallheader-bg.gif
+
+# Locale stuff
+locale/XXXX/global, XXXX/locale/XXXX/global
+locale/XXXX/necko/contents.rdf, XXXX/locale/XXXX/necko/contents.rdf
+locale/XXXX/necko/necko.properties, XXXX/locale/XXXX/necko/necko.properties
+locale/XXXX/necko/redirect_loop.dtd, XXXX/locale/XXXX/necko/redirect_loop.dtd
+locale/XXXX/communicator/contents.rdf, XXXX/locale/XXXX/communicator/contents.rdf
 locale/XXXX/communicator/security.properties, XXXX/locale/XXXX/communicator/security.properties
-locale/XXXX/communicator/security/caps.properties, XXXX/locale/XXXX/communicator/security/caps.properties
-locale/XXXX/navigator, XXXX/locale/XXXX/navigator
-locale/XXXX/navigator-platform, en-unix/locale/XXXX/navigator-platform
-locale/XXXX/global-platform, en-unix/locale/XXXX/global-platform
+locale/XXXX/communicator/security/caps.properties, XXXX/locale/XXXX/communicator/security/caps.properties
+locale/XXXX/navigator, XXXX/locale/XXXX/navigator
+locale/XXXX/navigator-platform, en-unix/locale/XXXX/navigator-platform
+locale/XXXX/global-platform, en-unix/locale/XXXX/global-platform
 locale/XXXX/communicator/layout, XXXX/locale/XXXX/communicator/layout
-
-# Help stuff
-content/help, help/content/help,
-skin/classic/communicator/help.css, classic/skin/classic/communicator/help.css,
-
-# PSM stuff
-locale/XXXX/pipnss, XXXX/locale/XXXX/pipnss
-locale/XXXX/pippki, XXXX/locale/XXXX/pippki
+locale/XXXX/forms, XXXX/locale/XXXX/forms
+
+# Help stuff
+content/help, help/content/help,
+skin/classic/communicator/help.css, classic/skin/classic/communicator/help.css,
+
+# PSM stuff
+locale/XXXX/pipnss, XXXX/locale/XXXX/pipnss
+locale/XXXX/pippki, XXXX/locale/XXXX/pippki

embedding/config/installed-chrome.txt

@@ -11,6 +11,9 @@ content,install,url,jar:resource:/chrome/embed.jar!/content/help/
 locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/help/
 skin,install,url,jar:resource:/chrome/embed.jar!/skin/classic/global/
 skin,install,url,jar:resource:/chrome/embed.jar!/skin/classic/communicator/
+content,install,url,jar:resource:/chrome/embed.jar!/content/forms/
+locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/forms/
+skin,install,url,jar:resource:/chrome/embed.jar!/skin/classic/forms/
 skin,install,select,classic/1.0 
 locale,install,select,en-US 
 content,install,url,jar:resource:/chrome/embed.jar!/content/global-region/