Merge pull request #23 from mozilla/1429160_DisableBuiltinPDFViewer

Policy for DisableBuiltinPDFViewer. Fixes #14

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 267c2444ce3480b8aba97caf0015150d11761600..027211d8927ec721b783d42b27feec173131c7e4 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -29,6 +29,8 @@
       <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
       <string id="DisableAppUpdate_Explain">Prevent the browser from updating.</string>
+      <string id="DisableBuiltinPDFViewer">Disable Builtin PDF Viewer</string>
+      <string id="DisableBuiltinPDFViewer_Explain">Disables PDF.js, which displays PDFs within Firefox.</string>
       <string id="DisableDeveloperTools">Disable Developer Tools</string>
       <string id="DisableDeveloperTools_Explain">Prevents access to developer tools.</string>
       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index abbd0a807c2077ef15dd223792fab4b27e730294..261bb08dcfddf3d6fd80d4fe3339621f3c2260ed 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -98,6 +98,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisableBuiltinPDFViewer" class="Both" displayName="$(string.DisableBuiltinPDFViewer)" explainText="$(string.DisableBuiltinPDFViewer_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableBuiltinPDFViewer">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisableDeveloperTools" class="Both" displayName="$(string.DisableDeveloperTools)" explainText="$(string.DisableDeveloperTools_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableDeveloperTools">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>