Start using satchel in suite b=304309 r=KaiRo (toolkit change is ifndef Firefox)

suite/browser/browser-prefs.js

@@ -164,7 +164,8 @@ pref("offline.download.download_messages",  0);
 pref("signon.rememberSignons",              true);
 pref("signon.expireMasterPassword",         false);
 
-pref("wallet.captureForms",                 true);
+pref("browser.formfill.enable",             true);
+pref("wallet.captureForms",                 false);
 pref("wallet.enabled",                      true);
 pref("wallet.crypto",                       false);
 pref("wallet.crypto.autocompleteoverride",  false); // Ignore 'autocomplete=off' - available only when wallet.crypto is enabled. 

suite/browser/navigator.xul

@@ -136,6 +136,8 @@
   <!-- context menu -->
   <popupset id="contentAreaContextSet"/>
 
+  <panel type="autocomplete" id="PopupAutoComplete"/>
+
   <toolbox id="navigator-toolbox" class="toolbox-top" deferattached="true">
     <!-- Menu -->
     <menubar id="main-menubar" persist="collapsed" grippytooltiptext="&menuBar.tooltip;"/>
@@ -349,6 +351,7 @@
                     flex="1" contenttooltip="aHTMLTooltip"
                     contentcontextmenu="contentAreaContextMenu"
                     onnewtab="BrowserOpenTab();"
+                    autocompletepopup="PopupAutoComplete"
                     onbookmarkgroup="addGroupmarkAs();"
                     onclick="return contentAreaClick(event);"/>
       </hbox>

suite/browser/tabbrowser.xml

@@ -120,7 +120,7 @@
           </xul:tabs>
         </xul:hbox>
         <xul:tabpanels flex="1" class="plain" selectedIndex="0" anonid="panelcontainer">
-          <xul:browser type="content-primary" xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu"/>
+          <xul:browser type="content-primary" xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu,autocompletepopup"/>
         </xul:tabpanels>
       </xul:tabbox>
       <children/>
@@ -1017,6 +1017,7 @@
             b.setAttribute("type", "content-targetable");
             b.setAttribute("contextmenu", this.getAttribute("contentcontextmenu"));
             b.setAttribute("tooltip", this.getAttribute("contenttooltip"));
+            b.setAttribute("autocompletepopup", this.getAttribute("autocompletepopup"));
 
             this.mPanelContainer.appendChild(b);
 

suite/installer/windows/packages

@@ -159,6 +159,7 @@ bin\components\layout_printing.xpt
 bin\components\layout_xul.xpt
 bin\components\layout_xul_tree.xpt
 bin\components\locale.xpt
+bin\components\loginmgr.xpt
 bin\components\lwbrk.xpt
 bin\components\mimetype.xpt
 bin\components\mork.dll
@@ -191,6 +192,8 @@ bin\components\proxyObject.xpt
 bin\components\rdf.dll
 bin\components\rdf.xpt
 bin\components\related.xpt
+bin\components\satchel.dll
+bin\components\satchel.xpt
 bin\components\saxparser.xpt
 bin\components\search.xpt
 bin\components\shistory.xpt
@@ -201,6 +204,7 @@ bin\components\storage.xpt
 bin\components\strgcmps.dll
 bin\components\suite.dll
 bin\components\suitemigration.xpt
+bin\components\tkautoc.dll
 bin\components\tkitcmps.dll
 bin\components\toolkitprofile.xpt
 bin\components\txmgr.dll
@@ -265,6 +269,9 @@ bin\components\nsComposerCmdLineHandler.js
 bin\components\nsDictionary.js
 bin\components\nsExtensionManager.js
 bin\components\nsInterfaceInfoToIDL.js
+bin\components\nsLoginInfo.js
+bin\components\nsLoginManager.js
+bin\components\nsLoginManagerPrompter.js
 bin\components\nsPostUpdateWin.js
 bin\components\nsProxyAutoConfig.js
 bin\components\nsResetPref.js
@@ -274,6 +281,7 @@ bin\components\nsUpdateService.js
 bin\components\nsURLFormatter.js
 bin\components\nsXmlRpcClient.js
 bin\components\pluginGlue.js
+bin\components\storage-Legacy.js
 bin\components\txEXSLTRegExFunctions.js
 bin\components\nsAboutAbout.js
 bin\components\nsDefaultCLH.js

themes/modern/global/autocomplete.css

@@ -1,108 +0,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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt <hewitt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 GPL or the LGPL. 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 ***** */
-
-/* ===== autocomplete.css =================================================
-  == Styles used by the autocomplete widget.
-  ======================================================================= */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* ::::: autocomplete ::::: */
-
-textbox[type="autocomplete"] {
-  cursor: default !important;
-}
-
-.textbox-input-box {
-  -moz-box-align: center;
-}
-
-/* ::::: history button ::::: */
-
-.autocomplete-history-dropmarker {
-  margin: 2px;
-  padding: 0;
-  border: none !important;
-  background-color: transparent !important;
-}
-
-.autocomplete-history-dropmarker[open="true"] {
-  margin: 3px 1px 1px 3px;
-}
-
-/* ::::: popups ::::: */
-
-.autocomplete-history-popup,
-.autocomplete-result-popup {
-  border: 1px solid;
-  -moz-border-top-colors: #6B747E;
-  -moz-border-right-colors: #6B747E;
-  -moz-border-bottom-colors: #6B747E;
-  -moz-border-left-colors: #6B747E;
-  background-color: #FFFFFF;
-}
-
-.autocomplete-history-popup {
-  max-height: 25em;
-}
-
-/* ::::: tree ::::: */
-
-.autocomplete-tree {
-  border: none;
-  background-color: transparent !important;
-}
-
-.autocomplete-treecol {
-  margin: 0px !important;
-  border: none !important;
-  padding: 0px !important;
-}
-
-.autocomplete-treebody::-moz-tree-cell-text {
-  padding-left: 8px;
-  color: #000000;
-}
-
-.autocomplete-treebody::-moz-tree-row(selected) {
-  background-color: #9499AC;
-}
-
-.autocomplete-treebody::-moz-tree-cell-text(selected) {
-  color: #FFFFFF !important;
-}

toolkit/content/xul.css

@@ -753,7 +753,7 @@ textbox[type="autocomplete"] {
   -moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete");
 }
 
-.autocomplete-result-popup {
+panel[type="autocomplete"] {
   -moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete-result-popup");
 }
 

xpfe/components/autocomplete/resources/content/autocomplete.xml

@@ -31,7 +31,7 @@
                       xbl:inherits="open,hidden=disablehistory" anonid="historydropmarker"/>
 
       <xul:popupset>
-        <xul:panel type="autocomplete" anonid="popup" class="autocomplete-result-popup" xbl:inherits="for=id,nomatch"/>
+        <xul:panel type="autocomplete" anonid="popup" xbl:inherits="for=id,nomatch"/>
       </xul:popupset>
       
       <children includes="menupopup"/>

xpfe/global/resources/content/xul.css

@@ -661,7 +661,7 @@ textbox[type="autocomplete"] {
   -moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete");
 }
 
-.autocomplete-result-popup {
+panel[type="autocomplete"] {
   -moz-binding: url("chrome://global/content/autocomplete.xml#autocomplete-result-popup");
 }