summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2022-05-08 16:55:28 -0400
committerGaming4JC <g4jc@hyperbola.info>2022-05-09 20:43:14 -0400
commit6df4dc4d4d7d6da640cd37edc38f3918ad8cb490 (patch)
tree2959e98d85a7a60582c3ce974285ece44a70d8e9
parent85bc095faaa9753010db3bcd6495b3b234609eb1 (diff)
downloadiceweasel-uxp-6df4dc4d4d7d6da640cd37edc38f3918ad8cb490.tar.gz
Remove more telemetry/unused files
-rw-r--r--base/content/browser-data-submission-info-bar.js121
-rw-r--r--base/content/browser-trackingprotection.js44
-rwxr-xr-xbase/content/global-scripts.inc4
-rw-r--r--base/jar.mn1
-rw-r--r--config/mozconfigs/linux32/debug3
-rw-r--r--config/mozconfigs/linux32/debug-asan3
-rw-r--r--config/mozconfigs/linux32/l10n-mozconfig3
-rw-r--r--config/mozconfigs/linux32/nightly-asan3
-rw-r--r--config/mozconfigs/linux64/debug3
-rw-r--r--config/mozconfigs/linux64/debug-asan3
-rw-r--r--config/mozconfigs/linux64/l10n-mozconfig3
-rw-r--r--config/mozconfigs/macosx-universal/l10n-mozconfig3
-rw-r--r--config/mozconfigs/macosx64/debug3
-rw-r--r--config/mozconfigs/macosx64/nightly3
-rw-r--r--config/mozconfigs/win32/debug3
-rw-r--r--config/mozconfigs/win32/l10n-mozconfig3
-rw-r--r--config/mozconfigs/win64/debug3
-rw-r--r--config/mozconfigs/win64/l10n-mozconfig3
-rw-r--r--installer/package-manifest.in4
-rw-r--r--themes/preprocess-tab-svgs.pycbin1125 -> 0 bytes
20 files changed, 0 insertions, 216 deletions
diff --git a/base/content/browser-data-submission-info-bar.js b/base/content/browser-data-submission-info-bar.js
deleted file mode 100644
index bb76903..0000000
--- a/base/content/browser-data-submission-info-bar.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Represents an info bar that shows a data submission notification.
- */
-var gDataNotificationInfoBar = {
- _OBSERVERS: [
- "datareporting:notify-data-policy:request",
- "datareporting:notify-data-policy:close",
- ],
-
- _DATA_REPORTING_NOTIFICATION: "data-reporting",
-
- get _notificationBox() {
- delete this._notificationBox;
- return this._notificationBox = document.getElementById("global-notificationbox");
- },
-
- get _log() {
- },
-
- init: function() {
- window.addEventListener("unload", () => {
- for (let o of this._OBSERVERS) {
- Services.obs.removeObserver(this, o);
- }
- }, false);
-
- for (let o of this._OBSERVERS) {
- Services.obs.addObserver(this, o, true);
- }
- },
-
- _getDataReportingNotification: function (name=this._DATA_REPORTING_NOTIFICATION) {
- return this._notificationBox.getNotificationWithValue(name);
- },
-
- _displayDataPolicyInfoBar: function (request) {
- if (this._getDataReportingNotification()) {
- return;
- }
-
- let brandBundle = document.getElementById("bundle_brand");
- let appName = brandBundle.getString("brandShortName");
- let vendorName = brandBundle.getString("vendorShortName");
-
- let message = gNavigatorBundle.getFormattedString(
- "dataReportingNotification.message",
- [appName, vendorName]);
-
- this._actionTaken = false;
-
- let buttons = [{
- label: gNavigatorBundle.getString("dataReportingNotification.button.label"),
- accessKey: gNavigatorBundle.getString("dataReportingNotification.button.accessKey"),
- popup: null,
- callback: () => {
- this._actionTaken = true;
- window.openAdvancedPreferences("dataChoicesTab");
- },
- }];
-
- this._log.info("Creating data reporting policy notification.");
- this._notificationBox.appendNotification(
- message,
- this._DATA_REPORTING_NOTIFICATION,
- null,
- this._notificationBox.PRIORITY_INFO_HIGH,
- buttons,
- event => {
- if (event == "removed") {
- Services.obs.notifyObservers(null, "datareporting:notify-data-policy:close", null);
- }
- }
- );
- // It is important to defer calling onUserNotifyComplete() until we're
- // actually sure the notification was displayed. If we ever called
- // onUserNotifyComplete() without showing anything to the user, that
- // would be very good for user choice. It may also have legal impact.
- request.onUserNotifyComplete();
- },
-
- _clearPolicyNotification: function () {
- let notification = this._getDataReportingNotification();
- if (notification) {
- this._log.debug("Closing notification.");
- notification.close();
- }
- },
-
- observe: function(subject, topic, data) {
- switch (topic) {
- case "datareporting:notify-data-policy:request":
- let request = subject.wrappedJSObject.object;
- try {
- this._displayDataPolicyInfoBar(request);
- } catch (ex) {
- request.onUserNotifyFailed(ex);
- return;
- }
- break;
-
- case "datareporting:notify-data-policy:close":
- // If this observer fires, it means something else took care of
- // responding. Therefore, we don't need to do anything. So, we
- // act like we took action and clear state.
- this._actionTaken = true;
- this._clearPolicyNotification();
- break;
-
- default:
- }
- },
-
- QueryInterface: XPCOMUtils.generateQI([
- Ci.nsIObserver,
- Ci.nsISupportsWeakReference,
- ]),
-};
diff --git a/base/content/browser-trackingprotection.js b/base/content/browser-trackingprotection.js
index 22092dd..426ed70 100644
--- a/base/content/browser-trackingprotection.js
+++ b/base/content/browser-trackingprotection.js
@@ -27,9 +27,6 @@ var TrackingProtection = {
gNavigatorBundle.getString("trackingProtection.icon.activeTooltip");
this.disabledTooltipText =
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip");
-
- this.enabledHistogramAdd(this.enabledGlobally);
- this.disabledPBMHistogramAdd(!this.enabledInPrivateWindows);
},
uninit() {
@@ -55,34 +52,6 @@ var TrackingProtection = {
this.container.hidden = !this.enabled;
},
- enabledHistogramAdd(value) {
- if (PrivateBrowsingUtils.isWindowPrivate(window)) {
- return;
- }
- Services.telemetry.getHistogramById("TRACKING_PROTECTION_ENABLED").add(value);
- },
-
- disabledPBMHistogramAdd(value) {
- if (PrivateBrowsingUtils.isWindowPrivate(window)) {
- return;
- }
- Services.telemetry.getHistogramById("TRACKING_PROTECTION_PBM_DISABLED").add(value);
- },
-
- eventsHistogramAdd(value) {
- if (PrivateBrowsingUtils.isWindowPrivate(window)) {
- return;
- }
- Services.telemetry.getHistogramById("TRACKING_PROTECTION_EVENTS").add(value);
- },
-
- shieldHistogramAdd(value) {
- if (PrivateBrowsingUtils.isWindowPrivate(window)) {
- return;
- }
- Services.telemetry.getHistogramById("TRACKING_PROTECTION_SHIELD").add(value);
- },
-
onSecurityChange(state, isSimulated) {
if (!this.enabled) {
return;
@@ -104,24 +73,17 @@ var TrackingProtection = {
this.icon.setAttribute("state", "blocked-tracking-content");
this.content.setAttribute("state", "blocked-tracking-content");
- this.shieldHistogramAdd(2);
} else if (isAllowing) {
this.icon.setAttribute("tooltiptext", this.disabledTooltipText);
this.icon.setAttribute("state", "loaded-tracking-content");
this.content.setAttribute("state", "loaded-tracking-content");
- this.shieldHistogramAdd(1);
} else {
this.icon.removeAttribute("tooltiptext");
this.icon.removeAttribute("state");
this.content.removeAttribute("state");
- // We didn't show the shield
- this.shieldHistogramAdd(0);
}
-
- // Telemetry for state change.
- this.eventsHistogramAdd(0);
},
disableForCurrentPage() {
@@ -142,9 +104,6 @@ var TrackingProtection = {
"trackingprotection", Services.perms.ALLOW_ACTION);
}
- // Telemetry for disable protection.
- this.eventsHistogramAdd(1);
-
// Hide the control center.
document.getElementById("identity-popup").hidePopup();
@@ -165,9 +124,6 @@ var TrackingProtection = {
Services.perms.remove(normalizedUrl, "trackingprotection");
}
- // Telemetry for enable protection.
- this.eventsHistogramAdd(2);
-
// Hide the control center.
document.getElementById("identity-popup").hidePopup();
diff --git a/base/content/global-scripts.inc b/base/content/global-scripts.inc
index ffaeeb4..e11f4e9 100755
--- a/base/content/global-scripts.inc
+++ b/base/content/global-scripts.inc
@@ -25,7 +25,3 @@
<script type="application/javascript" src="chrome://browser/content/browser-tabsintitlebar.js"/>
<script type="application/javascript" src="chrome://browser/content/browser-thumbnails.js"/>
<script type="application/javascript" src="chrome://browser/content/browser-trackingprotection.js"/>
-
-#ifdef MOZ_DATA_REPORTING
-<script type="application/javascript" src="chrome://browser/content/browser-data-submission-info-bar.js"/>
-#endif
diff --git a/base/jar.mn b/base/jar.mn
index 3f661be..03be5bd 100644
--- a/base/jar.mn
+++ b/base/jar.mn
@@ -65,7 +65,6 @@ browser.jar:
content/browser/browser-captivePortal.js (content/browser-captivePortal.js)
content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js)
content/browser/browser-customization.js (content/browser-customization.js)
- content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
content/browser/browser-feeds.js (content/browser-feeds.js)
content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js)
content/browser/browser-fullZoom.js (content/browser-fullZoom.js)
diff --git a/config/mozconfigs/linux32/debug b/config/mozconfigs/linux32/debug
index de97087..0c34334 100644
--- a/config/mozconfigs/linux32/debug
+++ b/config/mozconfigs/linux32/debug
@@ -9,9 +9,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
#Use ccache
# Package js shell.
diff --git a/config/mozconfigs/linux32/debug-asan b/config/mozconfigs/linux32/debug-asan
index 9fc7b9b..5919e00 100644
--- a/config/mozconfigs/linux32/debug-asan
+++ b/config/mozconfigs/linux32/debug-asan
@@ -11,9 +11,6 @@ ac_add_options --enable-valgrind
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/linux32/l10n-mozconfig b/config/mozconfigs/linux32/l10n-mozconfig
index ae7cc93..21b088d 100644
--- a/config/mozconfigs/linux32/l10n-mozconfig
+++ b/config/mozconfigs/linux32/l10n-mozconfig
@@ -8,9 +8,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
ac_add_options --disable-stdcxx-compat
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
diff --git a/config/mozconfigs/linux32/nightly-asan b/config/mozconfigs/linux32/nightly-asan
index 0930c18..735616e 100644
--- a/config/mozconfigs/linux32/nightly-asan
+++ b/config/mozconfigs/linux32/nightly-asan
@@ -13,9 +13,6 @@ export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Need this to prevent name conflicts with the normal nightly build packages
export MOZ_PKG_SPECIAL=asan
diff --git a/config/mozconfigs/linux64/debug b/config/mozconfigs/linux64/debug
index a879da7..2583163 100644
--- a/config/mozconfigs/linux64/debug
+++ b/config/mozconfigs/linux64/debug
@@ -9,9 +9,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/linux64/debug-asan b/config/mozconfigs/linux64/debug-asan
index a772dbb..7a3aa0d 100644
--- a/config/mozconfigs/linux64/debug-asan
+++ b/config/mozconfigs/linux64/debug-asan
@@ -11,9 +11,6 @@ ac_add_options --enable-valgrind
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/linux64/l10n-mozconfig b/config/mozconfigs/linux64/l10n-mozconfig
index 4df482d..0fbb87f 100644
--- a/config/mozconfigs/linux64/l10n-mozconfig
+++ b/config/mozconfigs/linux64/l10n-mozconfig
@@ -8,9 +8,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
ac_add_options --disable-stdcxx-compat
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
diff --git a/config/mozconfigs/macosx-universal/l10n-mozconfig b/config/mozconfigs/macosx-universal/l10n-mozconfig
index 80a06ed..5e45bdd 100644
--- a/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -11,9 +11,6 @@ fi
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
# Bug 1283438
mk_add_options AUTOCLOBBER=
diff --git a/config/mozconfigs/macosx64/debug b/config/mozconfigs/macosx64/debug
index 4b052aa..dc9206e 100644
--- a/config/mozconfigs/macosx64/debug
+++ b/config/mozconfigs/macosx64/debug
@@ -7,9 +7,6 @@ ac_add_options --enable-verify-mar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
diff --git a/config/mozconfigs/macosx64/nightly b/config/mozconfigs/macosx64/nightly
index 12fec04..5a95a13 100644
--- a/config/mozconfigs/macosx64/nightly
+++ b/config/mozconfigs/macosx64/nightly
@@ -5,9 +5,6 @@ ac_add_options --enable-verify-mar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
ac_add_options --with-macbundlename-prefix=Firefox
fi
diff --git a/config/mozconfigs/win32/debug b/config/mozconfigs/win32/debug
index 815276d..21de7fb 100644
--- a/config/mozconfigs/win32/debug
+++ b/config/mozconfigs/win32/debug
@@ -10,9 +10,6 @@ ac_add_options --enable-verify-mar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
. $topsrcdir/build/win32/mozconfig.vs-latest
# Package js shell.
diff --git a/config/mozconfigs/win32/l10n-mozconfig b/config/mozconfigs/win32/l10n-mozconfig
index d05067e..ec5dd80 100644
--- a/config/mozconfigs/win32/l10n-mozconfig
+++ b/config/mozconfigs/win32/l10n-mozconfig
@@ -7,9 +7,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
# Bug 1283438
mk_add_options AUTOCLOBBER=
diff --git a/config/mozconfigs/win64/debug b/config/mozconfigs/win64/debug
index db4eb59..f5997d7 100644
--- a/config/mozconfigs/win64/debug
+++ b/config/mozconfigs/win64/debug
@@ -13,9 +13,6 @@ ac_add_options --enable-verify-mar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/config/mozconfigs/win64/l10n-mozconfig b/config/mozconfigs/win64/l10n-mozconfig
index 3b9b4af..e8f32fb 100644
--- a/config/mozconfigs/win64/l10n-mozconfig
+++ b/config/mozconfigs/win64/l10n-mozconfig
@@ -8,9 +8,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
-# Enable Telemetry
-export MOZ_TELEMETRY_REPORTING=1
-
# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
# Bug 1283438
mk_add_options AUTOCLOBBER=
diff --git a/installer/package-manifest.in b/installer/package-manifest.in
index c361e63..f582d4d 100644
--- a/installer/package-manifest.in
+++ b/installer/package-manifest.in
@@ -468,8 +468,6 @@
@RESPATH@/components/SettingsManager.manifest
@RESPATH@/components/AppsService.js
@RESPATH@/components/AppsService.manifest
-@RESPATH@/components/recording-cmdline.js
-@RESPATH@/components/recording-cmdline.manifest
@RESPATH@/components/htmlMenuBuilder.js
@RESPATH@/components/htmlMenuBuilder.manifest
@@ -527,8 +525,6 @@
@RESPATH@/browser/chrome/browser.manifest
@RESPATH@/chrome/toolkit@JAREXT@
@RESPATH@/chrome/toolkit.manifest
-@RESPATH@/chrome/recording.manifest
-@RESPATH@/chrome/recording/*
#ifdef MOZ_GTK
@RESPATH@/browser/chrome/icons/default/default16.png
@RESPATH@/browser/chrome/icons/default/default32.png
diff --git a/themes/preprocess-tab-svgs.pyc b/themes/preprocess-tab-svgs.pyc
deleted file mode 100644
index 2f86716..0000000
--- a/themes/preprocess-tab-svgs.pyc
+++ /dev/null
Binary files differ