remove data choices tab from advanced.js

1 files changed, 0 insertions, 71 deletions

diff --git a/components/preferences/in-content/advanced.xul b/components/preferences/in-content/advanced.xul
index 4973f8e..531442f 100644
--- a/components/preferences/in-content/advanced.xul
+++ b/components/preferences/in-content/advanced.xul
@@ -22,11 +22,6 @@
   <preference id="accessibility.blockautorefresh"
               name="accessibility.blockautorefresh"
               type="bool"/>
-#ifdef XP_WIN
-  <preference id="ui.osk.enabled"
-              name="ui.osk.enabled"
-              type="bool"/>
-#endif
 
   <preference id="general.autoScroll"
               name="general.autoScroll"
@@ -48,12 +43,6 @@
               name="layout.spellcheckDefault"
               type="int"/>
 
-#ifdef MOZ_TELEMETRY_REPORTING
-  <preference id="toolkit.telemetry.enabled"
-              name="toolkit.telemetry.enabled"
-              type="bool"/>
-#endif
-
   <!-- Network tab -->
   <preference id="browser.cache.disk.capacity"
               name="browser.cache.disk.capacity"
@@ -67,26 +56,6 @@
               inverted="true"
               type="bool"/>
 
- <!-- Update tab -->
-#ifdef MOZ_UPDATER
-  <preference id="app.update.enabled"
-              name="app.update.enabled"
-              type="bool"/>
-  <preference id="app.update.auto"
-              name="app.update.auto"
-              type="bool"/>
-
-  <preference id="app.update.disable_button.showUpdateHistory"
-              name="app.update.disable_button.showUpdateHistory"
-              type="bool"/>
-
-#ifdef MOZ_MAINTENANCE_SERVICE
-  <preference id="app.update.service.enabled"
-              name="app.update.service.enabled"
-              type="bool"/>
-#endif
-#endif
-
   <preference id="browser.search.update"
               name="browser.search.update"
               type="bool"/>
@@ -132,9 +101,6 @@
 
   <tabs id="tabsElement">
     <tab id="generalTab" label="&generalTab.label;"/>
-#ifdef MOZ_DATA_REPORTING
-    <tab id="dataChoicesTab" label="&dataChoicesTab.label;"/>
-#endif
     <tab id="networkTab" label="&networkTab.label;"/>
     <tab id="updateTab" label="&updateTab.label;"/>
     <tab id="encryptionTab" label="&certificateTab.label;"/>
@@ -192,43 +158,6 @@
                   preference="layout.spellcheckDefault"/>
       </groupbox>
     </tabpanel>
-#ifdef MOZ_DATA_REPORTING
-    <!-- Data Choices -->
-    <tabpanel id="dataChoicesPanel" orient="vertical">
-#ifdef MOZ_TELEMETRY_REPORTING
-      <groupbox>
-        <caption>
-          <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
-                    accesskey="&enableHealthReport.accesskey;"/>
-        </caption>
-        <vbox>
-          <hbox class="indent">
-            <label flex="1">&healthReportDesc.label;</label>
-            <spacer flex="10"/>
-            <label id="FHRLearnMore"
-                   class="text-link">&healthReportLearnMore.label;</label>
-          </hbox>
-          <hbox class="indent">
-            <groupbox flex="1">
-              <caption>
-                <checkbox id="submitTelemetryBox" preference="toolkit.telemetry.enabled"
-                          label="&enableTelemetryData.label;"
-                          accesskey="&enableTelemetryData.accesskey;"/>
-              </caption>
-              <hbox class="indent">
-                <label id="telemetryDataDesc" flex="1">&telemetryDesc.label;</label>
-                <spacer flex="10"/>
-                <label id="telemetryLearnMore"
-                       class="text-link">&telemetryLearnMore.label;</label>
-              </hbox>
-            </groupbox>
-          </hbox>
-        </vbox>
-      </groupbox>
-#endif
-    </tabpanel>
-#endif
-
     <!-- Network -->
     <tabpanel id="networkPanel" orient="vertical">