Merge pull request #43 from mozilla/DisableForgetButton_Policy

Add DisableForgetButton policy to ADM

diff --git a/README.md b/README.md
index 9d7eaebc954ecdc33e12d457f9529aca8d283403..8dd5cbf27a79fbefcc834249d24f854484701158 100644 (file)
--- a/README.md
+++ b/README.md
@@ -165,6 +165,15 @@ This policy disables Firefox studies (Shield)
   }
 }
 ```
+### DisableForgetButton
+This policy disables the "Forget" button
+```
+{
+  "policies": {
+    "DisableForgetButton": true
+  }
+}
+```
 ### DisableFormHistory
 This policy turns off the browser.formfill.enable preferences
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index dc3b26f8e9af1a2d230df282e87527547df2830f..620228d432012027245b2ec69789fc1472377a86 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -53,6 +53,10 @@ If this policy is not configured or disabled, Firefox will not read certificates
       <string id="DisableFirefoxScreenshots_Explain">Prevents usage of the Firefox Screenshots feature.</string>
       <string id="DisableFirefoxStudies">Disable Firefox Studies</string>
       <string id="DisableFirefoxStudies_Explain">Prevents Firefox from running studies.</string>
+      <string id="DisableForgetButton">Disable Forget Button</string>
+      <string id="DisableForgetButton_Explain">If this policy is enabled, the &quot;Forget&quot; button is not available.
+
+If this policy is not configured or disabled, the &quot;Forget&quot; button is available.</string>
       <string id="DisableFormHistory">Disable Form History</string>
       <string id="DisableFormHistory_Explain">Don't remember search and form history.</string>
       <string id="DisablePocket">Disable Pocket</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 38bceb203a38b03f4bd3b3974877aa6f1dbb29e8..c7bce5626eb118cbe05f8d6e576c870de79da1cc 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -272,6 +272,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisableForgetButton" class="Both" displayName="$(string.DisableForgetButton)" explainText="$(string.DisableForgetButton_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableForgetButton">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisableFormHistory" class="Both" displayName="$(string.DisableFormHistory)" explainText="$(string.DisableFormHistory_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFormHistory">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>