Merge branch 'master' into 1433870_EnableTrackingProtection

diff --git a/README.md b/README.md
index 42e038291bc027fde2c091d5bea0a930de554ac8..c263320b4dc7f04d9783949a2bcd742c8fd29325 100644 (file)
--- a/README.md
+++ b/README.md
@@ -197,6 +197,21 @@ This policy stops Firefox from checking if it is the default browser at startup.
   }
 }
 ```
+### EnableTrackingProtection
+This policy affects tracking protection.
+
+If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+
+If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
+
+If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
+```
+{
+  "policies": {
+    "EnableTrackingProtection": {
+      "Value": [true, false],
+      "Locked": [true, false]
+    }
 ### NoDefaultBookmarks
 Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 2c4a9b70b73804de7c01925940e1c58d07ff7ae6..617ef7771a23a2b4c7783f851a5ef9ddfa615299 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -81,6 +81,12 @@
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>
       <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
+      <string id="TrackingProtection">Tracking Protection</string>
+      <string id="TrackingProtection_Explain">If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+
+If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
+
+If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
@@ -89,6 +95,9 @@
       <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
+      <presentation id="TrackingProtection">
+        <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
+      </presentation>
       <presentation id="HomepageURL">
         <text>URL:</text>
         <textBox refId="HomepageURL">

diff --git a/windows/firefox.admx b/windows/firefox.admx
index bb83f056252a28318dec494cf3ce6aa010a72045..b06e53294735950926089b6ae231fb7e3e679ed1 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -268,6 +268,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="TrackingProtection" class="Both" displayName="$(string.TrackingProtection)" explainText="$(string.TrackingProtection_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Value" presentation="$(presentation.TrackingProtection)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+      <elements >
+        <boolean id="TrackingProtectionLocked" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Locked">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
     <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>