Merge pull request #25 from mozilla/1440573_DisableSafeMode

Policy for Disable Safe Mode. Fixes #18

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 2e716d06d33aa65c2f093ce3c51f634db1326d1f..06beb4b42e885854def8814b8ed1418a0f90d454 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -47,6 +47,8 @@
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
+      <string id="DisableSafeMode">Disable Safe Mode</string>
+      <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>
       <string id="DisableSysAddonUpdate">Disable System Addon Updates</string>
       <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index c97352b1ef86e76ebe1b5cb65f3bdc4a016c83d1..842ada1987797b5c011f175e429be9266b400aee 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -188,6 +188,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisableSafeMode" class="Both" displayName="$(string.DisableSafeMode)" explainText="$(string.DisableSafeMode_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSafeMode">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisableSysAddonUpdate" class="Both" displayName="$(string.DisableSysAddonUpdate)" explainText="$(string.DisableSysAddonUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSysAddonUpdate">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>