Bug 1258295 - Remove remnants of Security Policies preferences pane. r=IanN
authorrsx11m <rsx11m.pub@gmail.com>
Thu, 24 Mar 2016 07:20:52 -0500
changeset 24722 9d94f84acb2edb94ec2d934448a0eb3dd4788011
parent 24721 709e8de02a1540e270af41bbb608b321e13f6a06
child 24723 71fc89a6bae956049e4153d871a77ff407443572
push id1657
push userclokep@gmail.com
push dateMon, 06 Jun 2016 19:50:21 +0000
treeherdercomm-beta@9fac989284b5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs1258295
Bug 1258295 - Remove remnants of Security Policies preferences pane. r=IanN
suite/common/jar.mn
suite/common/pref/pref-policies.xul
suite/common/pref/preferences.xul
suite/locales/en-US/chrome/common/pref/pref-policies.dtd
suite/locales/en-US/chrome/common/pref/preferences.dtd
suite/locales/jar.mn
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -206,17 +206,16 @@ comm.jar:
    content/communicator/pref/pref-locationbar.xul                   (pref/pref-locationbar.xul)
    content/communicator/pref/pref-mousewheel.js                     (pref/pref-mousewheel.js)
    content/communicator/pref/pref-mousewheel.xul                    (pref/pref-mousewheel.xul)
    content/communicator/pref/pref-navigator.js                      (pref/pref-navigator.js)
    content/communicator/pref/pref-navigator.xul                     (pref/pref-navigator.xul)
    content/communicator/pref/pref-offlineapps.js                    (pref/pref-offlineapps.js)
    content/communicator/pref/pref-offlineapps.xul                   (pref/pref-offlineapps.xul)
    content/communicator/pref/pref-passwords.xul                     (pref/pref-passwords.xul)
-   content/communicator/pref/pref-policies.xul                      (pref/pref-policies.xul)
    content/communicator/pref/pref-popups.js                         (pref/pref-popups.js)
    content/communicator/pref/pref-popups.xul                        (pref/pref-popups.xul)
    content/communicator/pref/pref-privatedata.js                    (pref/pref-privatedata.js)
    content/communicator/pref/pref-privatedata.xul                   (pref/pref-privatedata.xul)
    content/communicator/pref/pref-proxies.js                        (pref/pref-proxies.js)
    content/communicator/pref/pref-proxies.xul                       (pref/pref-proxies.xul)
    content/communicator/pref/pref-proxies-advanced.xul              (pref/pref-proxies-advanced.xul)
    content/communicator/pref/pref-scripts.js                        (pref/pref-scripts.js)
deleted file mode 100644
--- a/suite/common/pref/pref-policies.xul
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?> <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!-- 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 page [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % policiesDTD SYSTEM "chrome://communicator/locale/pref/pref-policies.dtd" >
-%policiesDTD;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');"
-      headertitle="&pref.policies.title;">
-  <groupbox>
-  
-    <description>&zoneIntro.label;</description>
-  
-    <label value="&policies.label;"/>
-    <hbox>
-      <tree id="zones" flex="1">
-        <treecols>
-          <treecol flex="1"/>
-        </treecols>
-        
-        <treechildren id="zoneChildren" flex="1">  
-          <treeitem open="true">
-            <treerow>
-              <treecell label="&default.label;"/>
-            </treerow>
-            <treechildren id="defaultChildren">
-              <treeitem>
-                <treerow>
-                  <treecell indent="true" label="&allWebsites.label;"/>
-                </treerow>
-              </treeitem>
-            </treechildren>
-          </treeitem>
-          <treeitem open="true">
-            <treerow>
-              <treecell label="&trusted.label;"/>
-            </treerow>
-            <treechildren id="trustedChildren"/>
-          </treeitem>
-          <treeitem open="true">
-            <treerow>
-              <treecell label="&annoyances.label;"/>
-            </treerow>
-          </treeitem>
-          <treeitem open="true">
-            <treerow>
-              <treecell label="&restricted.label;"/>
-            </treerow>
-          </treeitem>
-        </treechildren>
-      </tree>
-  
-      <vbox>
-        <button label="&addSite.label;" accesskey="&addSite.accesskey;"
-                oncommand="addSite();"/>
-        <spacer flex="1"/>              
-      </vbox>    
-    </hbox>
-    
-    <label class="header" value="&description.label;"/>
-    
-    <hbox class="indent">
-      <description id="description"></description>
-    </hbox>
-  
-    <hbox align="center">
-      <button label="&settings.label;" accesskey="&settings.accesskey;"
-              oncommand="settings();"/>
-    </hbox>
-
-  </groupbox>
-  
-</page>
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -125,19 +125,16 @@
                     prefpane="links_pane"
                     helpTopic="navigator_pref_link_behavior"
                     url="chrome://communicator/content/pref/pref-links.xul"/>
           <treeitem id="downloadItem"
                     label="&download.label;"
                     prefpane="download_pane"
                     helpTopic="navigator_pref_downloads"
                     url="chrome://communicator/content/pref/pref-download.xul"/>
-          <!-- Taking out Policies panel b/c bug 44121
-          <treeitem url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
-          -->
         </treechildren>
       </treeitem>
 
       <!-- Privacy & Security items -->
       <treeitem container="true"
                 id="securityItem"
                 prefpane="security_pane"
                 label="&security.label;"
deleted file mode 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-policies.dtd
+++ /dev/null
@@ -1,23 +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  pref.policies.title "Security Policies">
-
-<!ENTITY  zoneIntro.label     "&brandShortName; allows you to create policies that determine what access certain websites have to various functionality, including aspects of scripting and Java.">
-
-<!ENTITY  policies.label      "Policies:">
-<!ENTITY  default.label       "Default Policy">
-<!ENTITY  allWebsites.label   "All Websites">
-<!ENTITY  trusted.label       "Trusted Websites">
-<!ENTITY  annoyances.label    "Common Annoyances">
-<!ENTITY  restricted.label    "Restricted Websites">
-
-<!ENTITY  addSite.label       "Add Website…">
-<!ENTITY  addSite.accesskey   "a">
-<!ENTITY  settings.label      "Settings for ">
-<!ENTITY  settings.accesskey  "s">
-
-<!ENTITY  description.label   "Policy Description:">
- 
--- a/suite/locales/en-US/chrome/common/pref/preferences.dtd
+++ b/suite/locales/en-US/chrome/common/pref/preferences.dtd
@@ -33,14 +33,13 @@
 <!ENTITY offlineApps.label "Offline Apps">
 <!ENTITY proxies.label "Proxies">
 <!ENTITY httpnetworking.label "HTTP Networking">
 <!ENTITY smart.label "Software Installation">
 <!ENTITY download.label "Downloads">
 <!ENTITY keynav.label "Keyboard Navigation">
 <!ENTITY findAsYouType.label "Find As You Type">
 <!ENTITY search.label "Internet Search">
-<!ENTITY policies.label "Security Policies">
 <!ENTITY mousewheel.label "Mouse Wheel">
 <!ENTITY scriptsAndWindows.label "Scripts &amp; Plugins">
 <!ENTITY spellingPane.label  "Spelling">
 
 <!ENTITY focusSearch.key "f">
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -177,17 +177,16 @@
   locale/@AB_CD@/communicator/pref/pref-languages.dtd                       (%chrome/common/pref/pref-languages.dtd)
   locale/@AB_CD@/communicator/pref/pref-languages.properties                (%chrome/common/pref/pref-languages.properties)
   locale/@AB_CD@/communicator/pref/pref-links.dtd                           (%chrome/common/pref/pref-links.dtd)
   locale/@AB_CD@/communicator/pref/pref-locationbar.dtd                     (%chrome/common/pref/pref-locationbar.dtd)
   locale/@AB_CD@/communicator/pref/pref-mousewheel.dtd                      (%chrome/common/pref/pref-mousewheel.dtd)
   locale/@AB_CD@/communicator/pref/pref-navigator.dtd                       (%chrome/common/pref/pref-navigator.dtd)
   locale/@AB_CD@/communicator/pref/pref-offlineapps.dtd                     (%chrome/common/pref/pref-offlineapps.dtd)
   locale/@AB_CD@/communicator/pref/pref-passwords.dtd                       (%chrome/common/pref/pref-passwords.dtd)
-  locale/@AB_CD@/communicator/pref/pref-policies.dtd                        (%chrome/common/pref/pref-policies.dtd)
   locale/@AB_CD@/communicator/pref/pref-popups.dtd                          (%chrome/common/pref/pref-popups.dtd)
   locale/@AB_CD@/communicator/pref/pref-privatedata.dtd                     (%chrome/common/pref/pref-privatedata.dtd)
   locale/@AB_CD@/communicator/pref/pref-proxies.dtd                         (%chrome/common/pref/pref-proxies.dtd)
   locale/@AB_CD@/communicator/pref/pref-proxies-advanced.dtd                (%chrome/common/pref/pref-proxies-advanced.dtd)
   locale/@AB_CD@/communicator/pref/pref-scripts.dtd                         (%chrome/common/pref/pref-scripts.dtd)
   locale/@AB_CD@/communicator/pref/pref-search.dtd                          (%chrome/common/pref/pref-search.dtd)
   locale/@AB_CD@/communicator/pref/pref-security.dtd                        (%chrome/common/pref/pref-security.dtd)
   locale/@AB_CD@/communicator/pref/pref-smartupdate.dtd                     (%chrome/common/pref/pref-smartupdate.dtd)