Bug 43501 - r=ddrinan,sr=blizzard Add Privacy & Security to basic prefs

window.  Restructure security prefs, and move cookie and wallet prefs.

suite/common/pref/permissionsPrefsOverlay.xul

@@ -26,7 +26,7 @@
 <overlay id="cookiePrefsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <treechildren id="advancedChildren">
+  <treechildren id="securityChildren">
     <treeitem position="1">
       <treerow>
         <treecell class="treecell-indent"

suite/common/pref/pref-security.xul

@@ -0,0 +1,44 @@
+<?xml version="1.0"?> 
+<!-- 
+   - 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 Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -  Terry Hayes <thayes@netscape.com>
+   -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
+<window xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        orient="vertical"
+        id="securityWindow"
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');">
+
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = [];
+  ]]>
+  </script>
+  
+  <box class="box-smallheader" title="&lHeader;" />
+
+  <!-- Overlays add UI here -->
+</window>
+

suite/common/pref/preftree.xul

@@ -108,6 +108,15 @@
     </treeitem>
     <!-- XXX -->
     
+    <!-- Security and Privacy items -->
+    <treeitem container="true" open="true" id="securityItem">
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-security.xul"
+                  label="&security.label;" />
+      </treerow>
+      <treechildren id="securityChildren"/>
+    </treeitem>
+
     <treeitem container="true" open="true" id="advancedItem">
       <treerow>
         <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/> 

suite/locales/en-US/chrome/common/pref/pref-security.dtd

@@ -0,0 +1,24 @@
+<!-- 
+   - 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 Corp.  Portions created by Netscape are
+   - Copyright (C) 2001 Netscape Communications Corp.  All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -  Terry Hayes <thayes@netscape.com>
+   -->
+
+<!--LOCALIZATION NOTE : FILE 'Privacy and Security' prefs settings -->
+<!ENTITY lHeader                      "Privacy and Security">

suite/locales/en-US/chrome/common/pref/preftree.dtd

@@ -17,6 +17,7 @@
 <!ENTITY editing.label "New Page Settings">
 <!ENTITY publish.label "Publish">
 <!ENTITY offline.label "Offline">
+<!ENTITY security.label "Privacy and Security">
 <!ENTITY advance.label "Advanced">
 <!ENTITY down.label "Download">
 <!ENTITY cache.label "Cache">