diff options
105 files changed, 266 insertions, 3512 deletions
diff --git a/.gitmodules b/.gitmodules index 71daa90..d0de927 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "platform"]
- path = platform
-url=https://repo.palemoon.org/MoonchildProductions/GRE.git
\ No newline at end of file +[submodule "platform"] + path = platform + url = https://repo.palemoon.org/MoonchildProductions/UXP.git diff --git a/basilisk/LICENSE b/basilisk/LICENSE index f2d7bda..1d7dd0a 100644 --- a/basilisk/LICENSE +++ b/basilisk/LICENSE @@ -3,8 +3,8 @@ copyright licensing conditions attached to the platform codebase, including copies of the licenses concerned. You are not granted rights or licenses to the trademarks of Moonchild -Productions or any other party, including without limitation the -Basilisk name or logo. +Productions, the Basilisk Dev Team, or any other party, including without +limitation the Basilisk name or logo. The Serpent logo in branding/unofficial is derived from "Sea Serpent" by Lorc, licensed under the Creative Commons license CC-BY 3.0 diff --git a/basilisk/app/Makefile.in b/basilisk/app/Makefile.in index 19bc329..edb52e4 100644 --- a/basilisk/app/Makefile.in +++ b/basilisk/app/Makefile.in @@ -50,3 +50,50 @@ endif libs:: $(srcdir)/profile/channel-prefs.js $(NSINSTALL) -D $(DIST)/bin/defaults/pref $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) + +ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + +MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME) + +ifdef MOZ_DEBUG +MAC_APP_NAME := $(MAC_APP_NAME)Debug +endif + +AB_CD = $(MOZ_UI_LOCALE) + +ifeq (zh-TW,$(AB_CD)) +LPROJ_ROOT := $(subst -,_,$(AB_CD)) +else +LPROJ_ROOT := $(firstword $(subst -, ,$(AB_CD))) +endif +LPROJ := Contents/Resources/$(LPROJ_ROOT).lproj + +clean clobber repackage:: + $(RM) -r $(dist_dest) + +MAC_BUNDLE_VERSION = $(shell $(PYTHON) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h) + +.PHONY: repackage +tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) + $(MKDIR) -p '$(dist_dest)/Contents/MacOS' + $(MKDIR) -p '$(dist_dest)/$(LPROJ)' + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj + rsync -a --exclude '*.in' $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)' + sed -e 's/%APP_VERSION%/$(MOZ_APP_VERSION)/' -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' -e 's/%MOZ_MACBUNDLE_ID%/$(MOZ_MACBUNDLE_ID)/' -e 's/%MAC_BUNDLE_VERSION%/$(MAC_BUNDLE_VERSION)/' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist' + sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/$(LPROJ)/InfoPlist.strings' + rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources' + rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS' + # MacOS-files-copy.in is a list of files that should be copies rather + # than symlinks and placed in .app/Contents/MacOS. + rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS' + $(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)' + rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS' + cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns' + cp -RL $(DIST)/branding/document.icns '$(dist_dest)/Contents/Resources/document.icns' +ifdef MOZ_UPDATER + $(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices' + mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices' + ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' +endif + printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo' +endif diff --git a/basilisk/app/application.ini b/basilisk/app/application.ini index 05317ee..e481743 100644 --- a/basilisk/app/application.ini +++ b/basilisk/app/application.ini @@ -20,7 +20,7 @@ [App] # Vendor=@MOZ_APP_VENDOR@ -Vendor=Moonchild Productions +Vendor=Basilisk-Dev # Name=@MOZ_APP_BASENAME@ Name=Basilisk RemotingName=@MOZ_APP_REMOTINGNAME@ diff --git a/basilisk/app/module.ver b/basilisk/app/module.ver index 0373ff9..b1f08e0 100644 --- a/basilisk/app/module.ver +++ b/basilisk/app/module.ver @@ -1,8 +1,8 @@ -WIN32_MODULE_COMPANYNAME=Moonchild Productions -WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license. +WIN32_MODULE_COMPANYNAME=Basilisk Development Team +WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license. WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ -WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions. +WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of the Basilisk Development Team. WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ diff --git a/basilisk/app/nsBrowserApp.cpp b/basilisk/app/nsBrowserApp.cpp index 66ea8ae..deda833 100644 --- a/basilisk/app/nsBrowserApp.cpp +++ b/basilisk/app/nsBrowserApp.cpp @@ -32,7 +32,6 @@ #include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL #include "mozilla/Sprintf.h" -#include "mozilla/Telemetry.h" #include "mozilla/WindowsDllBlocklist.h" #if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID) @@ -110,7 +109,6 @@ static bool IsArg(const char* arg, const char* s) XRE_GetFileFromPathType XRE_GetFileFromPath; XRE_CreateAppDataType XRE_CreateAppData; XRE_FreeAppDataType XRE_FreeAppData; -XRE_TelemetryAccumulateType XRE_TelemetryAccumulate; XRE_StartupTimelineRecordType XRE_StartupTimelineRecord; XRE_mainType XRE_main; XRE_StopLateWriteChecksType XRE_StopLateWriteChecks; @@ -128,7 +126,6 @@ static const nsDynamicFunctionLoad kXULFuncs[] = { { "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath }, { "XRE_CreateAppData", (NSFuncPtr*) &XRE_CreateAppData }, { "XRE_FreeAppData", (NSFuncPtr*) &XRE_FreeAppData }, - { "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate }, { "XRE_StartupTimelineRecord", (NSFuncPtr*) &XRE_StartupTimelineRecord }, { "XRE_main", (NSFuncPtr*) &XRE_main }, { "XRE_StopLateWriteChecks", (NSFuncPtr*) &XRE_StopLateWriteChecks }, @@ -370,8 +367,6 @@ int main(int argc, char* argv[], char* envp[]) return 255; } - XRE_StartupTimelineRecord(mozilla::StartupTimeline::START, start); - #ifdef MOZ_BROWSER_CAN_BE_CONTENTPROC XRE_EnableSameExecutableForContentProc(); #endif diff --git a/basilisk/app/profile/basilisk.js b/basilisk/app/profile/basilisk.js index f6575d8..0ca123f 100644 --- a/basilisk/app/profile/basilisk.js +++ b/basilisk/app/profile/basilisk.js @@ -943,10 +943,6 @@ pref("services.sync.prefs.sync.browser.link.open_newwindow", true); pref("services.sync.prefs.sync.browser.newtabpage.enabled", true); pref("services.sync.prefs.sync.browser.newtabpage.pinned", true); pref("services.sync.prefs.sync.browser.offline-apps.notify", true); -#ifdef MOZ_SAFE_BROWSING -pref("services.sync.prefs.sync.browser.safebrowsing.phishing.enabled", true); -pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true); -#endif pref("services.sync.prefs.sync.browser.search.update", true); pref("services.sync.prefs.sync.browser.sessionstore.restore_on_demand", true); pref("services.sync.prefs.sync.browser.startup.homepage", true); @@ -991,8 +987,6 @@ pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true); pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true); pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true); pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true); -pref("services.sync.prefs.sync.privacy.trackingprotection.enabled", true); -pref("services.sync.prefs.sync.privacy.trackingprotection.pbmode.enabled", true); pref("services.sync.prefs.sync.security.OCSP.enabled", true); pref("services.sync.prefs.sync.security.OCSP.require", true); pref("services.sync.prefs.sync.security.default_personal_cert", true); @@ -1196,24 +1190,14 @@ pref("media.gmp-widevinecdm.visible", true); pref("media.gmp-widevinecdm.enabled", true); #endif -// Play with different values of the decay time and get telemetry, +// Play with different values of the decay time, // 0 means to randomize (and persist) the experiment value in users' profiles, // -1 means no experiment is run and we use the preferred value for frecency (6h) -pref("browser.cache.frecency_experiment", 0); - -// Telemetry settings. -// Determines if Telemetry pings can be archived locally. -pref("toolkit.telemetry.archive.enabled", true); +pref("browser.cache.frecency_experiment", -1); // Enable GMP support in the addon manager. pref("media.gmp-provider.enabled", true); -#ifdef NIGHTLY_BUILD -pref("privacy.trackingprotection.ui.enabled", true); -#else -pref("privacy.trackingprotection.ui.enabled", false); -#endif - #ifndef RELEASE_OR_BETA // At the moment, autostart.2 is used, while autostart.1 is unused. // We leave it here set to false to reset users' defaults and allow diff --git a/basilisk/base/content/aboutDialog.xul b/basilisk/base/content/aboutDialog.xul index bb69fac..70a2c74 100644 --- a/basilisk/base/content/aboutDialog.xul +++ b/basilisk/base/content/aboutDialog.xul @@ -124,14 +124,14 @@ </vbox> #ifdef MC_PRIVATE_BUILD <description class="text-blurb" id="communityDesc"> - This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.basilisk-browser.org/">Basilisk website</label>. + This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://basilisk-browser.org/">Basilisk website</label>. </description> #else <description class="text-blurb" id="communityDesc"> - Basilisk is community software released by <label class="text-link" href="http://www.palemoon.org/">the Pale Moon team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software. + Basilisk is community software released by <label class="text-link" href="https://basilisk-browser.org/">the Basilisk Browser team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software. Basilisk was formerly developed by the <a href="https://www.palemoon.org">Pale Moon</a> team. Without them this project would not exist. Thank you to Moonchild and others for your work on Basilisk over the years. </description> <description class="text-blurb" id="contributeDesc"> - <b>Basilisk is no longer supported or updated.</b> Please consider using an actively-developed web browser to remain safe and secure. + Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating to the Pale Moon project</label> or get involved with the <label class="text-link" href="https://repo.palemoon.org/MoonchildProductions/UXP">development</label> of the Unified XUL Platform. </description> #endif </vbox> diff --git a/basilisk/base/content/aboutNetError.xhtml b/basilisk/base/content/aboutNetError.xhtml index 5ff79ea..77aca22 100644 --- a/basilisk/base/content/aboutNetError.xhtml +++ b/basilisk/base/content/aboutNetError.xhtml @@ -123,12 +123,6 @@ document.getElementById("advancedButton") .addEventListener("click", function togglePanelVisibility() { toggleDisplay(panel); - - if (panel.style.display == "block") { - // send event to trigger telemetry ping - var event = new CustomEvent("AboutNetErrorUIExpanded", {bubbles:true}); - document.dispatchEvent(event); - } }); if (allowOverride) { diff --git a/basilisk/base/content/abouthealthreport/abouthealth.js b/basilisk/base/content/abouthealthreport/abouthealth.js index 66cbe16..b8ae2b1 100644 --- a/basilisk/base/content/abouthealthreport/abouthealth.js +++ b/basilisk/base/content/abouthealthreport/abouthealth.js @@ -11,7 +11,6 @@ Cu.import("resource://gre/modules/Services.jsm"); const prefs = new Preferences("datareporting.healthreport."); -const PREF_UNIFIED = "toolkit.telemetry.unified"; const PREF_REPORTING_URL = "datareporting.healthreport.about.reportUrl"; var healthReportWrapper = { @@ -48,49 +47,10 @@ var healthReportWrapper = { } }, - sendTelemetryPingList: function () { - console.log("AboutHealthReport: Collecting Telemetry ping list."); - MozSelfSupport.getTelemetryPingList().then((list) => { - console.log("AboutHealthReport: Sending Telemetry ping list."); - this.injectData("telemetry-ping-list", list); - }).catch((ex) => { - console.log("AboutHealthReport: Collecting ping list failed: " + ex); - }); - }, - - sendTelemetryPingData: function (pingId) { - console.log("AboutHealthReport: Collecting Telemetry ping data."); - MozSelfSupport.getTelemetryPing(pingId).then((ping) => { - console.log("AboutHealthReport: Sending Telemetry ping data."); - this.injectData("telemetry-ping-data", { - id: pingId, - pingData: ping, - }); - }).catch((ex) => { - console.log("AboutHealthReport: Loading ping data failed: " + ex); - this.injectData("telemetry-ping-data", { - id: pingId, - error: "error-generic", - }); - }); - }, - sendCurrentEnvironment: function () { - console.log("AboutHealthReport: Sending Telemetry environment data."); - MozSelfSupport.getCurrentTelemetryEnvironment().then((environment) => { - this.injectData("telemetry-current-environment-data", environment); - }).catch((ex) => { - console.log("AboutHealthReport: Collecting current environment data failed: " + ex); - }); }, sendCurrentPingData: function () { - console.log("AboutHealthReport: Sending current Telemetry ping data."); - MozSelfSupport.getCurrentTelemetrySubsessionPing().then((ping) => { - this.injectData("telemetry-current-ping-data", ping); - }).catch((ex) => { - console.log("AboutHealthReport: Collecting current ping data failed: " + ex); - }); }, injectData: function (type, content) { @@ -129,12 +89,6 @@ var healthReportWrapper = { case "RequestCurrentPrefs": this.updatePrefState(); break; - case "RequestTelemetryPingList": - this.sendTelemetryPingList(); - break; - case "RequestTelemetryPingData": - this.sendTelemetryPingData(evt.detail.id); - break; case "RequestCurrentEnvironment": this.sendCurrentEnvironment(); break; diff --git a/basilisk/base/content/baseMenuOverlay.xul b/basilisk/base/content/baseMenuOverlay.xul index def549b..445ce8d 100644 --- a/basilisk/base/content/baseMenuOverlay.xul +++ b/basilisk/base/content/baseMenuOverlay.xul @@ -57,13 +57,6 @@ onclick="checkForMiddleClick(this, event);" label="&helpKeyboardShortcuts.label;" accesskey="&helpKeyboardShortcuts.accesskey;"/> -#ifdef MOZ_TELEMETRY_REPORTING - <menuitem id="healthReport" - label="&healthReport2.label;" - accesskey="&healthReport2.accesskey;" - oncommand="openHealthReport()" - onclick="checkForMiddleClick(this, event);"/> -#endif <menuitem id="troubleShooting" accesskey="&helpTroubleshootingInfo.accesskey;" label="&helpTroubleshootingInfo.label;" diff --git a/basilisk/base/content/blockedSite.xhtml b/basilisk/base/content/blockedSite.xhtml deleted file mode 100644 index 10a4b33..0000000 --- a/basilisk/base/content/blockedSite.xhtml +++ /dev/null @@ -1,196 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE html [ - <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> - %htmlDTD; - <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> - %globalDTD; - <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > - %brandDTD; - <!ENTITY % blockedSiteDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd"> - %blockedSiteDTD; -]> - -<!-- 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/. --> - -<html xmlns="http://www.w3.org/1999/xhtml" class="blacklist"> - <head> - <link rel="stylesheet" href="chrome://browser/skin/blockedSite.css" type="text/css" media="all" /> - <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/> - - <script type="application/javascript"><![CDATA[ - // Error url MUST be formatted like this: - // about:blocked?e=error_code&u=url(&o=1)? - // (o=1 when user overrides are allowed) - - // Note that this file uses document.documentURI to get - // the URL (with the format from above). This is because - // document.location.href gets the current URI off the docshell, - // which is the URL displayed in the location bar, i.e. - // the URI that the user attempted to load. - - function getErrorCode() - { - var url = document.documentURI; - var error = url.search(/e\=/); - var duffUrl = url.search(/\&u\=/); - return decodeURIComponent(url.slice(error + 2, duffUrl)); - } - - function getURL() - { - var url = document.documentURI; - var match = url.match(/&u=([^&]+)&/); - - // match == null if not found; if so, return an empty string - // instead of what would turn out to be portions of the URI - if (!match) - return ""; - - url = decodeURIComponent(match[1]); - - // If this is a view-source page, then get then real URI of the page - if (url.startsWith("view-source:")) - url = url.slice(12); - return url; - } - - /** - * Check whether this warning page should be overridable or whether - * the "ignore warning" button should be hidden. - */ - function getOverride() - { - var url = document.documentURI; - var match = url.match(/&o=1&/); - return !!match; - } - - /** - * Attempt to get the hostname via document.location. Fail back - * to getURL so that we always return something meaningful. - */ - function getHostString() - { - try { - return document.location.hostname; - } catch (e) { - return getURL(); - } - } - - function initPage() - { - var error = ""; - switch (getErrorCode()) { - case "malwareBlocked" : - error = "malware"; - break; - case "deceptiveBlocked" : - error = "phishing"; - break; - case "unwantedBlocked" : - error = "unwanted"; - break; - default: - return; - } - - var el; - - if (error !== "malware") { - el = document.getElementById("errorTitleText_malware"); - el.parentNode.removeChild(el); - el = document.getElementById("errorShortDescText_malware"); - el.parentNode.removeChild(el); - el = document.getElementById("errorLongDescText_malware"); - el.parentNode.removeChild(el); - } - - if (error !== "phishing") { - el = document.getElementById("errorTitleText_phishing"); - el.parentNode.removeChild(el); - el = document.getElementById("errorShortDescText_phishing"); - el.parentNode.removeChild(el); - el = document.getElementById("errorLongDescText_phishing"); - el.parentNode.removeChild(el); - } - - if (error !== "unwanted") { - el = document.getElementById("errorTitleText_unwanted"); - el.parentNode.removeChild(el); - el = document.getElementById("errorShortDescText_unwanted"); - el.parentNode.removeChild(el); - el = document.getElementById("errorLongDescText_unwanted"); - el.parentNode.removeChild(el); - } - - // Set sitename - document.getElementById(error + "_sitename").textContent = getHostString(); - document.title = document.getElementById("errorTitleText_" + error) - .innerHTML; - - if (!getOverride()) { - var btn = document.getElementById("ignoreWarningButton"); - if (btn) { - btn.parentNode.removeChild(btn); - } - } - - // Inform the test harness that we're done loading the page - var event = new CustomEvent("AboutBlockedLoaded"); - document.dispatchEvent(event); - } - ]]></script> - </head> - - <body dir="&locale.dir;"> - <div id="errorPageContainer" class="container"> - - <!-- Error Title --> - <div id="errorTitle" class="title"> - <h1 class="title-text" id="errorTitleText_phishing">&safeb.blocked.phishingPage.title2;</h1> - <h1 class="title-text" id="errorTitleText_malware">&safeb.blocked.malwarePage.title;</h1> - <h1 class="title-text" id="errorTitleText_unwanted">&safeb.blocked.unwantedPage.title;</h1> - </div> - - <div id="errorLongContent"> - - <!-- Short Description --> - <div id="errorShortDesc"> - <p id="errorShortDescText_phishing">&safeb.blocked.phishingPage.shortDesc2;</p> - <p id="errorShortDescText_malware">&safeb.blocked.malwarePage.shortDesc;</p> - <p id="errorShortDescText_unwanted">&safeb.blocked.unwantedPage.shortDesc;</p> - </div> - - <!-- Long Description --> - <div id="errorLongDesc"> - <p id="errorLongDescText_phishing">&safeb.blocked.phishingPage.longDesc2;</p> - <p id="errorLongDescText_malware">&safeb.blocked.malwarePage.longDesc;</p> - <p id="errorLongDescText_unwanted">&safeb.blocked.unwantedPage.longDesc;</p> - </div> - - <!-- Action buttons --> - <div id="buttons" class="button-container"> - <!-- Commands handled in browser.js --> - <button id="getMeOutButton" class="primary">&safeb.palm.accept.label;</button> - <div class="button-spacer"></div> - <button id="reportButton">&safeb.palm.reportPage.label;</button> - </div> - </div> - <div id="ignoreWarning"> - <button id="ignoreWarningButton">&safeb.palm.decline.label;</button> - </div> - </div> - <!-- - - Note: It is important to run the script this way, instead of using - - an onload handler. This is because error pages are loaded as - - LOAD_BACKGROUND, which means that onload handlers will not be executed. - --> - <script type="application/javascript"> - initPage(); - </script> - </body> -</html> diff --git a/basilisk/base/content/browser-data-submission-info-bar.js b/basilisk/base/content/browser-data-submission-info-bar.js index 0c87d19..bb76903 100644 --- a/basilisk/base/content/browser-data-submission-info-bar.js +++ b/basilisk/base/content/browser-data-submission-info-bar.js @@ -2,9 +2,6 @@ * 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/. */ -const LOGGER_NAME = "Toolkit.Telemetry"; -const LOGGER_PREFIX = "DataNotificationInfoBar::"; - /** * Represents an info bar that shows a data submission notification. */ @@ -22,9 +19,6 @@ var gDataNotificationInfoBar = { }, get _log() { - let Log = Cu.import("resource://gre/modules/Log.jsm", {}).Log; - delete this._log; - return this._log = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX); }, init: function() { diff --git a/basilisk/base/content/browser-doctype.inc b/basilisk/base/content/browser-doctype.inc index 30d70cc..14f5f80 100644 --- a/basilisk/base/content/browser-doctype.inc +++ b/basilisk/base/content/browser-doctype.inc @@ -13,10 +13,6 @@ %customizeToolbarDTD; <!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd"> %placesDTD; -#ifdef MOZ_SAFE_BROWSING -<!ENTITY % safebrowsingDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd"> -%safebrowsingDTD; -#endif <!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd"> %aboutHomeDTD; #ifdef MOZ_SERVICES_SYNC diff --git a/basilisk/base/content/browser-fullScreenAndPointerLock.js b/basilisk/base/content/browser-fullScreenAndPointerLock.js index b26a31f..a72b409 100644 --- a/basilisk/base/content/browser-fullScreenAndPointerLock.js +++ b/basilisk/base/content/browser-fullScreenAndPointerLock.js @@ -342,11 +342,6 @@ var FullScreen = { // TabsInTitlebar._update() and bug 1173768. TabsInTitlebar.updateAppearance(true); } - - if (enterFS && !document.fullscreenElement) { - Services.telemetry.getHistogramById("FX_BROWSER_FULLSCREEN_USED") - .add(1); - } }, exitDomFullScreen : function() { diff --git a/basilisk/base/content/browser-media.js b/basilisk/base/content/browser-media.js index 775fc4d..12e134a 100644 --- a/basilisk/base/content/browser-media.js +++ b/basilisk/base/content/browser-media.js @@ -185,12 +185,6 @@ XPCOMUtils.defineLazyGetter(gEMEHandler, "_brandShortName", function() { return document.getElementById("bundle_brand").getString("brandShortName"); }); -const TELEMETRY_DDSTAT_SHOWN = 0; -const TELEMETRY_DDSTAT_SHOWN_FIRST = 1; -const TELEMETRY_DDSTAT_CLICKED = 2; -const TELEMETRY_DDSTAT_CLICKED_FIRST = 3; -const TELEMETRY_DDSTAT_SOLVED = 4; - let gDecoderDoctorHandler = { getLabelForNotificationBox(type) { if (type == "platform-decoder-not-found") { @@ -240,14 +234,12 @@ let gDecoderDoctorHandler = { // - 'type' is the type of issue, it determines which text to show in the // infobar. // - 'decoderDoctorReportId' is the Decoder Doctor issue identifier, to be - // used here as key for the telemetry (counting infobar displays, - // "Learn how" buttons clicks, and resolutions) and for the prefs used - // to store at-issue formats. + // used here as key for the prefs used to store at-issue formats. // - 'formats' contains a comma-separated list of formats (or key systems) // that suffer the issue. These are kept in a pref, which the backend // uses to later find when an issue is resolved. // - 'isSolved' is true when the notification actually indicates the - // resolution of that issue, to be reported as telemetry. + // resolution of that issue. let {type, isSolved, decoderDoctorReportId, formats} = parsedData; type = type.toLowerCase(); // Error out early on invalid ReportId @@ -264,9 +256,6 @@ let gDecoderDoctorHandler = { // (Writing prefs from e10s content is now allowed.) let formatsPref = "media.decoder-doctor." + decoderDoctorReportId + ".formats"; let buttonClickedPref = "media.decoder-doctor." + decoderDoctorReportId + ".button-clicked"; - let histogram = - Services.telemetry.getKeyedHistogramById("DECODER_DOCTOR_INFOBAR_STATS"); - let formatsInPref = Services.prefs.getPrefType(formatsPref) && Services.prefs.getCharPref(formatsPref); @@ -277,7 +266,6 @@ let gDecoderDoctorHandler = { } if (!formatsInPref) { Services.prefs.setCharPref(formatsPref, formats); - histogram.add(decoderDoctorReportId, TELEMETRY_DDSTAT_SHOWN_FIRST); } else { // Split existing formats into an array of strings. let existing = formatsInPref.split(",").map(String.trim); @@ -290,7 +278,6 @@ let gDecoderDoctorHandler = { existing.concat(newbies).join(", ")); } } - histogram.add(decoderDoctorReportId, TELEMETRY_DDSTAT_SHOWN); let buttons = []; let sumo = gDecoderDoctorHandler.getSumoForLearnHowButton(type); @@ -303,9 +290,7 @@ let gDecoderDoctorHandler = { Services.prefs.getBoolPref(buttonClickedPref); if (!clickedInPref) { Services.prefs.setBoolPref(buttonClickedPref, true); - histogram.add(decoderDoctorReportId, TELEMETRY_DDSTAT_CLICKED_FIRST); } - histogram.add(decoderDoctorReportId, TELEMETRY_DDSTAT_CLICKED); let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL"); openUILinkIn(baseURL + sumo, "tab"); @@ -322,10 +307,9 @@ let gDecoderDoctorHandler = { ); } else if (formatsInPref) { // Issue is solved, and prefs haven't been cleared yet, meaning it's the - // first time we get this resolution -> Clear prefs and report telemetry. + // first time we get this resolution -> Clear prefs. Services.prefs.clearUserPref(formatsPref); Services.prefs.clearUserPref(buttonClickedPref); - histogram.add(decoderDoctorReportId, TELEMETRY_DDSTAT_SOLVED); } }, } diff --git a/basilisk/base/content/browser-plugins.js b/basilisk/base/content/browser-plugins.js index d8ed768..32a6210 100644 --- a/basilisk/base/content/browser-plugins.js +++ b/basilisk/base/content/browser-plugins.js @@ -111,18 +111,7 @@ var gPluginHandler = { }, _clickToPlayNotificationEventCallback: function(event) { - if (event == "showing") { - Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_SHOWN") - .add(!this.options.primaryPlugin); - // Histograms always start at 0, even though our data starts at 1 - let histogramCount = this.options.pluginData.size - 1; - if (histogramCount > 4) { - histogramCount = 4; - } - Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_PLUGIN_COUNT") - .add(histogramCount); - } - else if (event == "dismissed") { + if (event == "dismissed") { // Once the popup is dismissed, clicking the icon should show the full // list again this.options.primaryPlugin = null; @@ -138,8 +127,6 @@ var gPluginHandler = { let permission; let expireType; let expireTime; - let histogram = - Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_USER_ACTION"); // Update the permission manager. // Also update the current state of pluginInfo.fallbackType so that @@ -149,7 +136,6 @@ var gPluginHandler = { permission = Ci.nsIPermissionManager.ALLOW_ACTION; expireType = Ci.nsIPermissionManager.EXPIRE_SESSION; expireTime = Date.now() + Services.prefs.getIntPref(this.PREF_SESSION_PERSIST_MINUTES) * 60 * 1000; - histogram.add(0); aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_ACTIVE; break; @@ -158,7 +144,6 @@ var gPluginHandler = { expireType = Ci.nsIPermissionManager.EXPIRE_TIME; expireTime = Date.now() + Services.prefs.getIntPref(this.PREF_PERSISTENT_DAYS) * 24 * 60 * 60 * 1000; - histogram.add(1); aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_ACTIVE; break; @@ -166,7 +151,6 @@ var gPluginHandler = { permission = Ci.nsIPermissionManager.PROMPT_ACTION; expireType = Ci.nsIPermissionManager.EXPIRE_NEVER; expireTime = 0; - histogram.add(2); switch (aPluginInfo.blocklistState) { case Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE: aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE; @@ -347,9 +331,6 @@ var gPluginHandler = { return; } - Services.telemetry.getHistogramById("PLUGINS_INFOBAR_SHOWN"). - add(true); - let message; // Icons set directly cannot be manipulated using moz-image-region, so // we use CSS classes instead. @@ -386,9 +367,6 @@ var gPluginHandler = { label: gNavigatorBundle.getString("pluginContinueBlocking.label"), accessKey: gNavigatorBundle.getString("pluginContinueBlocking.accesskey"), callback: function() { - Services.telemetry.getHistogramById("PLUGINS_INFOBAR_BLOCK"). - add(true); - Services.perms.addFromPrincipal(principal, "plugin-hidden-notification", Services.perms.DENY_ACTION); @@ -398,9 +376,6 @@ var gPluginHandler = { label: gNavigatorBundle.getString("pluginActivateTrigger.label"), accessKey: gNavigatorBundle.getString("pluginActivateTrigger.accesskey"), callback: function() { - Services.telemetry.getHistogramById("PLUGINS_INFOBAR_ALLOW"). - add(true); - let curNotification = PopupNotifications.getNotification("click-to-play-plugins", browser); diff --git a/basilisk/base/content/browser-safebrowsing.js b/basilisk/base/content/browser-safebrowsing.js deleted file mode 100644 index 430d84f..0000000 --- a/basilisk/base/content/browser-safebrowsing.js +++ /dev/null @@ -1,48 +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/. */ - -var gSafeBrowsing = { - - setReportPhishingMenu: function() { - // In order to detect whether or not we're at the phishing warning - // page, we have to check the documentURI instead of the currentURI. - // This is because when the DocShell loads an error page, the - // currentURI stays at the original target, while the documentURI - // will point to the internal error page we loaded instead. - var docURI = gBrowser.selectedBrowser.documentURI; - var isPhishingPage = - docURI && docURI.spec.startsWith("about:blocked?e=deceptiveBlocked"); - - // Show/hide the appropriate menu item. - document.getElementById("menu_HelpPopup_reportPhishingtoolmenu") - .hidden = isPhishingPage; - document.getElementById("menu_HelpPopup_reportPhishingErrortoolmenu") - .hidden = !isPhishingPage; - - var broadcasterId = isPhishingPage - ? "reportPhishingErrorBroadcaster" - : "reportPhishingBroadcaster"; - - var broadcaster = document.getElementById(broadcasterId); - if (!broadcaster) - return; - - // Now look at the currentURI to learn which page we were trying - // to browse to. - let uri = gBrowser.currentURI; - if (uri && (uri.schemeIs("http") || uri.schemeIs("https"))) - broadcaster.removeAttribute("disabled"); - else - broadcaster.setAttribute("disabled", true); - }, - - /** - * Used to report a phishing page or a false positive - * @param name String One of "Phish", "Error", "Malware" or "MalwareError" - * @return String the report phishing URL. - */ - getReportURL: function(name) { - return SafeBrowsing.getReportURL(name, gBrowser.currentURI); - } -} diff --git a/basilisk/base/content/browser-trackingprotection.js b/basilisk/base/content/browser-trackingprotection.js deleted file mode 100644 index 20917a0..0000000 --- a/basilisk/base/content/browser-trackingprotection.js +++ /dev/null @@ -1,177 +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/. */ - -var TrackingProtection = { - // If the user ignores the doorhanger, we stop showing it after some time. - PREF_ENABLED_GLOBALLY: "privacy.trackingprotection.enabled", - PREF_ENABLED_IN_PRIVATE_WINDOWS: "privacy.trackingprotection.pbmode.enabled", - enabledGlobally: false, - enabledInPrivateWindows: false, - container: null, - content: null, - icon: null, - activeTooltipText: null, - disabledTooltipText: null, - - init() { - let $ = selector => document.querySelector(selector); - this.container = $("#tracking-protection-container"); - this.content = $("#tracking-protection-content"); - this.icon = $("#tracking-protection-icon"); - - this.updateEnabled(); - Services.prefs.addObserver(this.PREF_ENABLED_GLOBALLY, this, false); - Services.prefs.addObserver(this.PREF_ENABLED_IN_PRIVATE_WINDOWS, this, false); - - this.activeTooltipText = - gNavigatorBundle.getString("trackingProtection.icon.activeTooltip"); - this.disabledTooltipText = - gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"); - - this.enabledHistogramAdd(this.enabledGlobally); - this.disabledPBMHistogramAdd(!this.enabledInPrivateWindows); - }, - - uninit() { - Services.prefs.removeObserver(this.PREF_ENABLED_GLOBALLY, this); - Services.prefs.removeObserver(this.PREF_ENABLED_IN_PRIVATE_WINDOWS, this); - }, - - observe() { - this.updateEnabled(); - }, - - get enabled() { - return this.enabledGlobally || - (this.enabledInPrivateWindows && - PrivateBrowsingUtils.isWindowPrivate(window)); - }, - - updateEnabled() { - this.enabledGlobally = - Services.prefs.getBoolPref(this.PREF_ENABLED_GLOBALLY); - this.enabledInPrivateWindows = - Services.prefs.getBoolPref(this.PREF_ENABLED_IN_PRIVATE_WINDOWS); - 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; - } - - // Only animate the shield if the event was not fired directly from - // the tabbrowser (due to a browser change). - if (isSimulated) { - this.icon.removeAttribute("animate"); - } else { - this.icon.setAttribute("animate", "true"); - } - - let isBlocking = state & Ci.nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT; - let isAllowing = state & Ci.nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT; - - if (isBlocking) { - this.icon.setAttribute("tooltiptext", this.activeTooltipText); - 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() { - // Convert document URI into the format used by - // nsChannelClassifier::ShouldEnableTrackingProtection. - // Any scheme turned into https is correct. - let normalizedUrl = Services.io.newURI( - "https://" + gBrowser.selectedBrowser.currentURI.hostPort, - null, null); - - // Add the current host in the 'trackingprotection' consumer of - // the permission manager using a normalized URI. This effectively - // places this host on the tracking protection allowlist. - if (PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) { - PrivateBrowsingUtils.addToTrackingAllowlist(normalizedUrl); - } else { - Services.perms.add(normalizedUrl, - "trackingprotection", Services.perms.ALLOW_ACTION); - } - - // Telemetry for disable protection. - this.eventsHistogramAdd(1); - - // Hide the control center. - document.getElementById("identity-popup").hidePopup(); - - BrowserReload(); - }, - - enableForCurrentPage() { - // Remove the current host from the 'trackingprotection' consumer - // of the permission manager. This effectively removes this host - // from the tracking protection allowlist. - let normalizedUrl = Services.io.newURI( - "https://" + gBrowser.selectedBrowser.currentURI.hostPort, - null, null); - - if (PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) { - PrivateBrowsingUtils.removeFromTrackingAllowlist(normalizedUrl); - } else { - Services.perms.remove(normalizedUrl, "trackingprotection"); - } - - // Telemetry for enable protection. - this.eventsHistogramAdd(2); - - // Hide the control center. - document.getElementById("identity-popup").hidePopup(); - - BrowserReload(); - }, -}; diff --git a/basilisk/base/content/browser.js b/basilisk/base/content/browser.js index 13fc774..61bba23 100644 --- a/basilisk/base/content/browser.js +++ b/basilisk/base/content/browser.js @@ -15,7 +15,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm"); ["AboutHome", "resource:///modules/AboutHome.jsm"], ["AddonWatcher", "resource://gre/modules/AddonWatcher.jsm"], ["AppConstants", "resource://gre/modules/AppConstants.jsm"], - ["BrowserUsageTelemetry", "resource:///modules/BrowserUsageTelemetry.jsm"], ["BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"], ["CharsetMenu", "resource://gre/modules/CharsetMenu.jsm"], ["Color", "resource://gre/modules/Color.jsm"], @@ -51,11 +50,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm"); ["webrtcUI", "resource:///modules/webrtcUI.jsm", ] ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource)); -#ifdef MOZ_SAFE_BROWSING - XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", - "resource://gre/modules/SafeBrowsing.jsm"); -#endif - // lazy service getters [ ["Favicons", "@mozilla.org/browser/favicon-service;1", "mozIAsyncFavicons"], @@ -955,7 +949,6 @@ var gBrowserInit = { BrowserOnClick.init(); FeedHandler.init(); AboutPrivateBrowsingListener.init(); - TrackingProtection.init(); RefreshBlocker.init(); CaptivePortalWatcher.init(); @@ -1049,10 +1042,6 @@ var gBrowserInit = { _delayedStartup: function() { let tmp = {}; - Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp); - let TelemetryTimestamps = tmp.TelemetryTimestamps; - TelemetryTimestamps.add("delayedStartupStarted"); - this._cancelDelayedStartup(); // We need to set the OfflineApps message listeners up before we @@ -1168,11 +1157,6 @@ var gBrowserInit = { } } -#ifdef MOZ_SAFE_BROWSING - // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008. - setTimeout(function() { SafeBrowsing.init(); }, 2000); -#endif - Services.obs.addObserver(gIdentityHandler, "perm-changed", false); Services.obs.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false); Services.obs.addObserver(gXPInstallObserver, "addon-install-disabled", false); @@ -1194,8 +1178,6 @@ var gBrowserInit = { PanelUI.init(); LightweightThemeListener.init(); - Services.telemetry.getHistogramById("E10S_WINDOW").add(gMultiProcessBrowser); - SidebarUI.startDelayedLoad(); UpdateUrlbarSearchSplitterState(); @@ -1349,20 +1331,6 @@ var gBrowserInit = { this.gmpInstallManager.simpleCheckAndInstall().then(null, () => {}); }, 1000 * 60); - // Report via telemetry whether we're able to play MP4/H.264/AAC video. - // We suspect that some Windows users have a broken or have not installed - // Windows Media Foundation, and we'd like to know how many. We'd also like - // to know how good our coverage is on other platforms. - // Note: we delay by 90 seconds reporting this, as calling canPlayType() - // on Windows will cause DLLs to load, i.e. cause disk I/O. - setTimeout(() => { - let v = document.createElementNS("http://www.w3.org/1999/xhtml", "video"); - let aacWorks = v.canPlayType("audio/mp4") != ""; - Services.telemetry.getHistogramById("VIDEO_CAN_CREATE_AAC_DECODER").add(aacWorks); - let h264Works = v.canPlayType("video/mp4") != ""; - Services.telemetry.getHistogramById("VIDEO_CAN_CREATE_H264_DECODER").add(h264Works); - }, 90 * 1000); - SessionStore.promiseInitialized.then(() => { // Bail out if the window has been closed in the meantime. if (window.closed) { @@ -1375,23 +1343,6 @@ var gBrowserInit = { // Start monitoring slow add-ons AddonWatcher.init(); - // Telemetry for master-password - we do this after 5 seconds as it - // can cause IO if NSS/PSM has not already initialized. - setTimeout(() => { - if (window.closed) { - return; - } - let secmodDB = Cc["@mozilla.org/security/pkcs11moduledb;1"] - .getService(Ci.nsIPKCS11ModuleDB); - let slot = secmodDB.findSlotByName(""); - let mpEnabled = slot && - slot.status != Ci.nsIPKCS11Slot.SLOT_UNINITIALIZED && - slot.status != Ci.nsIPKCS11Slot.SLOT_READY; - if (mpEnabled) { - Services.telemetry.getHistogramById("MASTER_PASSWORD_ENABLED").add(mpEnabled); - } - }, 5000); - PanicButtonNotifier.init(); }); @@ -1406,7 +1357,6 @@ var gBrowserInit = { this.delayedStartupFinished = true; Services.obs.notifyObservers(window, "browser-delayed-startup-finished", ""); - TelemetryTimestamps.add("delayedStartupFinished"); }, // Returns the URI(s) to load at startup. @@ -1476,8 +1426,6 @@ var gBrowserInit = { FeedHandler.uninit(); - TrackingProtection.uninit(); - RefreshBlocker.uninit(); CaptivePortalWatcher.uninit(); @@ -2687,12 +2635,6 @@ var gMenuButtonUpdateBadge = { } }; -// Values for telemtery bins: see TLS_ERROR_REPORT_UI in Histograms.json -const TLS_ERROR_REPORT_TELEMETRY_AUTO_CHECKED = 2; -const TLS_ERROR_REPORT_TELEMETRY_AUTO_UNCHECKED = 3; -const TLS_ERROR_REPORT_TELEMETRY_MANUAL_SEND = 4; -const TLS_ERROR_REPORT_TELEMETRY_AUTO_SEND = 5; - const PREF_SSL_IMPACT_ROOTS = ["security.tls.version.", "security.ssl3."]; const PREF_SSL_IMPACT = PREF_SSL_IMPACT_ROOTS.reduce((prefs, root) => { @@ -2712,7 +2654,6 @@ var BrowserOnClick = { mm.addMessageListener("Browser:SiteBlockedError", this); mm.addMessageListener("Browser:EnableOnlineMode", this); mm.addMessageListener("Browser:ResetSSLPreferences", this); - mm.addMessageListener("Browser:SSLErrorReportTelemetry", this); mm.addMessageListener("Browser:OverrideWeakCrypto", this); mm.addMessageListener("Browser:SSLErrorGoBack", this); @@ -2726,7 +2667,6 @@ var BrowserOnClick = { mm.removeMessageListener("Browser:SiteBlockedError", this); mm.removeMessageListener("Browser:EnableOnlineMode", this); mm.removeMessageListener("Browser:ResetSSLPreferences", this); - mm.removeMessageListener("Browser:SSLErrorReportTelemetry", this); mm.removeMessageListener("Browser:OverrideWeakCrypto", this); mm.removeMessageListener("Browser:SSLErrorGoBack", this); @@ -2772,19 +2712,6 @@ var BrowserOnClick = { } msg.target.reload(); break; - case "Browser:SetSSLErrorReportAuto": - Services.prefs.setBoolPref("security.ssl.errorReporting.automatic", msg.json.automatic); - let bin = TLS_ERROR_REPORT_TELEMETRY_AUTO_UNCHECKED; - if (msg.json.automatic) { - bin = TLS_ERROR_REPORT_TELEMETRY_AUTO_CHECKED; - } - Services.telemetry.getHistogramById("TLS_ERROR_REPORT_UI").add(bin); - break; - case "Browser:SSLErrorReportTelemetry": - let reportStatus = msg.data.reportStatus; - Services.telemetry.getHistogramById("TLS_ERROR_REPORT_UI") - .add(reportStatus); - break; case "Browser:OverrideWeakCrypto": let weakCryptoOverride = Cc["@mozilla.org/security/weakcryptooverride;1"] .getService(Ci.nsIWeakCryptoOverride); @@ -3479,9 +3406,6 @@ const BrowserSearch = { */ loadSearchFromContext: function (terms) { let engine = BrowserSearch._loadSearch(terms, true, "contextmenu"); - if (engine) { - BrowserSearch.recordSearchInTelemetry(engine, "contextmenu"); - } }, pasteAndSearch: function (event) { @@ -3505,56 +3429,8 @@ const BrowserSearch = { var newWindowPref = gPrefService.getIntPref("browser.link.open_newwindow"); var where = newWindowPref == 3 ? "tab" : "window"; openUILinkIn(this.searchEnginesURL, where); - }, - - /** - * Helper to record a search with Telemetry. - * - * Telemetry records only search counts and nothing pertaining to the search itself. - * - * @param engine - * (nsISearchEngine) The engine handling the search. - * @param source - * (string) Where the search originated from. See BrowserUsageTelemetry for - * allowed values. - * @param details [optional] - * An optional parameter passed to |BrowserUsageTelemetry.recordSearch|. - * See its documentation for allowed options. - * Additionally, if the search was a suggested search, |details.selection| - * indicates where the item was in the suggestion list and how the user - * selected it: {selection: {index: The selected index, kind: "key" or "mouse"}} - */ - recordSearchInTelemetry: function (engine, source, details={}) { - try { - BrowserUsageTelemetry.recordSearch(engine, source, details); - } catch (ex) { - Cu.reportError(ex); - } - }, - - /** - * Helper to record a one-off search with Telemetry. - * - * Telemetry records only search counts and nothing pertaining to the search itself. - * - * @param engine - * (nsISearchEngine) The engine handling the search. - * @param source - * (string) Where the search originated from. See BrowserUsageTelemetry for - * allowed values. - * @param type - * (string) Indicates how the user selected the search item. - * @param where - * (string) Where was the search link opened (e.g. new tab, current tab, ..). - */ - recordOneoffSearchInTelemetry: function (engine, source, type, where) { - try { - const details = {type, isOneOff: true}; - BrowserUsageTelemetry.recordSearch(engine, source, details); - } catch (ex) { - Cu.reportError(ex); - } } + }; XPCOMUtils.defineConstant(this, "BrowserSearch", BrowserSearch); @@ -4292,7 +4168,6 @@ var XULBrowserWindow = { uri = Services.uriFixup.createExposableURI(uri); } catch (e) {} gIdentityHandler.updateIdentity(this._state, uri); - TrackingProtection.onSecurityChange(this._state, aIsSimulated); }, // simulate all change notifications after switching tabs @@ -4881,11 +4756,6 @@ var gTabletModePageCounter = { }, finish() { - if (this.enabled) { - let histogram = Services.telemetry.getKeyedHistogramById("FX_TABLETMODE_PAGE_LOAD"); - histogram.add("tablet", this._tabletCount); - histogram.add("desktop", this._desktopCount); - } }, }; @@ -6415,12 +6285,6 @@ var gIdentityHandler = { }, disableMixedContentProtection() { - // Use telemetry to measure how often unblocking happens - const kMIXED_CONTENT_UNBLOCK_EVENT = 2; - let histogram = - Services.telemetry.getHistogramById( - "MIXED_CONTENT_UNBLOCK_COUNTER"); - histogram.add(kMIXED_CONTENT_UNBLOCK_EVENT); // Reload the page with the content unblocked BrowserReloadWithFlags( Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_MIXED_CONTENT); @@ -7137,9 +7001,6 @@ var gIdentityHandler = { this._permissionJustRemoved = true; this.updatePermissionHint(); - // Set telemetry values for clearing a permission - let histogram = Services.telemetry.getKeyedHistogramById("WEB_PERMISSION_CLEARED"); - let permissionType = 0; if (aPermission.state == SitePermissions.ALLOW) { // 1 : clear permanently allowed permission @@ -7742,12 +7603,6 @@ var AboutPrivateBrowsingListener = { msg => { OpenBrowserWindow({private: true}); }); - window.messageManager.addMessageListener( - "AboutPrivateBrowsing:ToggleTrackingProtection", - msg => { - const PREF = "privacy.trackingprotection.pbmode.enabled"; - Services.prefs.setBoolPref(PREF, !Services.prefs.getBoolPref(PREF)); - }); } }; diff --git a/basilisk/base/content/content.js b/basilisk/base/content/content.js index d2a70ba..23890df 100644 --- a/basilisk/base/content/content.js +++ b/basilisk/base/content/content.js @@ -217,12 +217,6 @@ Cc["@mozilla.org/eventlistenerservice;1"] .getService(Ci.nsIEventListenerService) .addSystemEventListener(global, "contextmenu", handleContentContextMenu, false); -// Values for telemtery bins: see TLS_ERROR_REPORT_UI in Histograms.json -const TLS_ERROR_REPORT_TELEMETRY_UI_SHOWN = 0; -const TLS_ERROR_REPORT_TELEMETRY_EXPANDED = 1; -const TLS_ERROR_REPORT_TELEMETRY_SUCCESS = 6; -const TLS_ERROR_REPORT_TELEMETRY_FAILURE = 7; - const SEC_ERROR_BASE = Ci.nsINSSErrorsService.NSS_SEC_ERROR_BASE; const MOZILLA_PKIX_ERROR_BASE = Ci.nsINSSErrorsService.MOZILLA_PKIX_ERROR_BASE; diff --git a/basilisk/base/content/global-scripts.inc b/basilisk/base/content/global-scripts.inc index 6edb112..d974856 100644 --- a/basilisk/base/content/global-scripts.inc +++ b/basilisk/base/content/global-scripts.inc @@ -22,13 +22,9 @@ <script type="application/javascript" src="chrome://browser/content/browser-places.js"/> <script type="application/javascript" src="chrome://browser/content/browser-plugins.js"/> <script type="application/javascript" src="chrome://browser/content/browser-refreshblocker.js"/> -#ifdef MOZ_SAFE_BROWSING -<script type="application/javascript" src="chrome://browser/content/browser-safebrowsing.js"/> -#endif <script type="application/javascript" src="chrome://browser/content/browser-sidebar.js"/> <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"/> diff --git a/basilisk/base/content/newtab/page.js b/basilisk/base/content/newtab/page.js index 9cc91e8..9402b07 100644 --- a/basilisk/base/content/newtab/page.js +++ b/basilisk/base/content/newtab/page.js @@ -213,9 +213,6 @@ var gPage = { }, onPageFirstVisible: function () { - // Record another page impression. - Services.telemetry.getHistogramById("NEWTAB_PAGE_SHOWN").add(true); - for (let site of gGrid.sites) { if (site) { // The site may need to modify and/or re-render itself if diff --git a/basilisk/base/content/newtab/sites.js b/basilisk/base/content/newtab/sites.js index 548c20a..9d91aea 100644 --- a/basilisk/base/content/newtab/sites.js +++ b/basilisk/base/content/newtab/sites.js @@ -270,21 +270,6 @@ Site.prototype = { }, /** - * Record interaction with site using telemetry. - */ - _recordSiteClicked: function(aIndex) { - if (Services.prefs.prefHasUserValue("browser.newtabpage.rows") || - Services.prefs.prefHasUserValue("browser.newtabpage.columns") || - aIndex > 8) { - // We only want to get indices for the default configuration, everything - // else goes in the same bucket. - aIndex = 9; - } - Services.telemetry.getHistogramById("NEWTAB_PAGE_SITE_CLICKED") - .add(aIndex); - }, - - /** * Handles site click events. */ onClick: function(aEvent) { @@ -296,11 +281,6 @@ Site.prototype = { // Handle tile/thumbnail link click if (target.classList.contains("newtab-link") || target.parentElement.classList.contains("newtab-link")) { - // Record for primary and middle clicks - if (button == 0 || button == 1) { - this._recordSiteClicked(tileIndex); - action = "click"; - } } // Only handle primary clicks for the remaining targets else if (button == 0) { diff --git a/basilisk/base/content/overrides/app-license.html b/basilisk/base/content/overrides/app-license.html index 0a1f0d8..ec61ecf 100644 --- a/basilisk/base/content/overrides/app-license.html +++ b/basilisk/base/content/overrides/app-license.html @@ -2,6 +2,9 @@ - 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/. --> <p><b>Binaries</b> of this product have been made available to you by the - <a href="http://www.palemoon.org/">Pale Moon project team</a> and - <a href="http://www.moonchildproductions.info/">Moonchild Productions</a> under the Mozilla - Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p> + <a href="https://basilisk-browser.org">Basilisk Development Team</a> under the Mozilla + Public Licence 2.0 (MPL). <a href="about:rights">Know your rights!</a></p> + <br> + Basilisk was formerly developed by the <a href="http://www.palemoon.org/">Pale Moon project team</a> + and <a href="http://www.moonchildproductions.info/">Moonchild Productions</a>. Without them this project + would not exist. diff --git a/basilisk/base/content/report-phishing-overlay.xul b/basilisk/base/content/report-phishing-overlay.xul deleted file mode 100644 index 712079f..0000000 --- a/basilisk/base/content/report-phishing-overlay.xul +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.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/. --> - -<!DOCTYPE overlay [ -<!ENTITY % reportphishDTD SYSTEM "chrome://browser/locale/safebrowsing/report-phishing.dtd"> -%reportphishDTD; -<!ENTITY % safebrowsingDTD SYSTEM "chrome://browser/locale/safebrowsing/phishing-afterload-warning-message.dtd"> -%safebrowsingDTD; -]> - -<overlay id="reportPhishingMenuOverlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <broadcasterset id="mainBroadcasterSet"> - <broadcaster id="reportPhishingBroadcaster" disabled="true"/> - <broadcaster id="reportPhishingErrorBroadcaster" disabled="true"/> - </broadcasterset> - <menupopup id="menu_HelpPopup"> - <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" - label="&reportDeceptiveSiteMenu.title;" - accesskey="&reportDeceptiveSiteMenu.accesskey;" - insertbefore="aboutSeparator" - observes="reportPhishingBroadcaster" - oncommand="openUILink(gSafeBrowsing.getReportURL('Phish'), event);" - onclick="checkForMiddleClick(this, event);"/> - <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" - label="&safeb.palm.notdeceptive.label;" - accesskey="&safeb.palm.notdeceptive.accesskey;" - insertbefore="aboutSeparator" - observes="reportPhishingErrorBroadcaster" - oncommand="openUILinkIn(gSafeBrowsing.getReportURL('PhishMistake'), 'tab');" - onclick="checkForMiddleClick(this, event);"/> - </menupopup> -</overlay> diff --git a/basilisk/base/content/tab-content.js b/basilisk/base/content/tab-content.js index 2eae5d3..1438b25 100644 --- a/basilisk/base/content/tab-content.js +++ b/basilisk/base/content/tab-content.js @@ -195,8 +195,6 @@ var AboutPrivateBrowsingListener = { init(chromeGlobal) { chromeGlobal.addEventListener("AboutPrivateBrowsingOpenWindow", this, false, true); - chromeGlobal.addEventListener("AboutPrivateBrowsingToggleTrackingProtection", this, - false, true); }, get isAboutPrivateBrowsing() { @@ -211,9 +209,6 @@ var AboutPrivateBrowsingListener = { case "AboutPrivateBrowsingOpenWindow": sendAsyncMessage("AboutPrivateBrowsing:OpenPrivateWindow"); break; - case "AboutPrivateBrowsingToggleTrackingProtection": - sendAsyncMessage("AboutPrivateBrowsing:ToggleTrackingProtection"); - break; } }, }; diff --git a/basilisk/base/content/tabbrowser.xml b/basilisk/base/content/tabbrowser.xml index a9e936d..f95d7db 100644 --- a/basilisk/base/content/tabbrowser.xml +++ b/basilisk/base/content/tabbrowser.xml @@ -1304,8 +1304,7 @@ This function assumes we have an LRU cache of tabs (either images of tab content or their layers). The goal is to find out how far into the cache we need to look in order to find - aTab. We record this number in telemetry and also move aTab to - the front of the cache. + aTab. We move aTab to the front of the cache. A newly created tab has position Infinity in the cache. If a tab is closed, it has no effect on the position of other @@ -1317,10 +1316,6 @@ <method name="_recordTabAccess"> <parameter name="aTab"/> <body><![CDATA[ - if (!Services.telemetry.canRecordExtended) { - return; - } - let tabs = Array.from(this.visibleTabs); let pos = aTab.cachePosition; @@ -1332,10 +1327,6 @@ } } aTab.cachePosition = 0; - - if (isFinite(pos)) { - Services.telemetry.getHistogramById("TAB_SWITCH_CACHE_POSITION").add(pos); - } ]]></body> </method> @@ -2243,8 +2234,6 @@ if (animate) { requestAnimationFrame(function () { - this.tabContainer._handleTabTelemetryStart(t, aURI); - // kick the animation off t.setAttribute("fadein", "true"); }.bind(this)); @@ -2428,8 +2417,6 @@ return; } - this.tabContainer._handleTabTelemetryStart(aTab); - this._blurTab(aTab); aTab.style.maxWidth = ""; // ensure that fade-out transition happens aTab.removeAttribute("fadein"); @@ -5846,81 +5833,6 @@ </body> </method> - <method name="_handleTabTelemetryStart"> - <parameter name="aTab"/> - <parameter name="aURI"/> - <body> - <![CDATA[ - // Animation-smoothness telemetry/logging - if (Services.telemetry.canRecordExtended || this._tabAnimationLoggingEnabled) { - if (aURI == "about:newtab" && (aTab._tPos == 1 || aTab._tPos == 2)) { - // Indicate newtab page animation where other tabs are unaffected - // (for which case, the 2nd or 3rd tabs are good representatives, even if not absolute) - aTab._recordingTabOpenPlain = true; - } - aTab._recordingHandle = window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils) - .startFrameTimeRecording(); - } - - // Overall animation duration - aTab._animStartTime = Date.now(); - ]]> - </body> - </method> - - <method name="_handleTabTelemetryEnd"> - <parameter name="aTab"/> - <body> - <![CDATA[ - if (!aTab._animStartTime) { - return; - } - - aTab._animStartTime = 0; - - // Handle tab animation smoothness telemetry/logging of frame intervals and paint times - if (!("_recordingHandle" in aTab)) { - return; - } - - let intervals = window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils) - .stopFrameTimeRecording(aTab._recordingHandle); - delete aTab._recordingHandle; - let frameCount = intervals.length; - - if (this._tabAnimationLoggingEnabled) { - let msg = "Tab " + (aTab.closing ? "close" : "open") + " (Frame-interval):\n"; - for (let i = 0; i < frameCount; i++) { - msg += Math.round(intervals[i]) + "\n"; - } - Services.console.logStringMessage(msg); - } - - // For telemetry, the first frame interval is not useful since it may represent an interval - // to a relatively old frame (prior to recording start). So we'll ignore it for the average. - if (frameCount > 1) { - let averageInterval = 0; - for (let i = 1; i < frameCount; i++) { - averageInterval += intervals[i]; - } - averageInterval = averageInterval / (frameCount - 1); - - Services.telemetry.getHistogramById("FX_TAB_ANIM_ANY_FRAME_INTERVAL_MS").add(averageInterval); - - if (aTab._recordingTabOpenPlain) { - delete aTab._recordingTabOpenPlain; - // While we do have a telemetry probe NEWTAB_PAGE_ENABLED to monitor newtab preview, it'll be - // easier to overview the data without slicing by it. Hence the additional histograms with _PREVIEW. - let preview = this._browserNewtabpageEnabled ? "_PREVIEW" : ""; - Services.telemetry.getHistogramById("FX_TAB_ANIM_OPEN" + preview + "_FRAME_INTERVAL_MS").add(averageInterval); - } - } - ]]> - </body> - </method> - <!-- Deprecated stuff, implemented for backwards compatibility. --> <property name="mAllTabsPopup" readonly="true" onget="return document.getElementById('alltabs-popup');"/> @@ -5935,8 +5847,6 @@ var tab = event.target; - this._handleTabTelemetryEnd(tab); - if (tab.getAttribute("fadein") == "true") { if (tab._fullyOpen) this.adjustTabstrip(); diff --git a/basilisk/base/content/urlbarBindings.xml b/basilisk/base/content/urlbarBindings.xml index b9c1781..4ff1e66 100644 --- a/basilisk/base/content/urlbarBindings.xml +++ b/basilisk/base/content/urlbarBindings.xml @@ -601,8 +601,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. typeof(engineOrEngineName) == "string" ? Services.search.getEngineByName(engineOrEngineName) : engineOrEngineName; - let isOneOff = this.popup.oneOffSearchButtons - .maybeRecordTelemetry(event, openUILinkWhere, openUILinkParams); // Infer the type of the event which triggered the search. let eventType = "unknown"; if (event instanceof KeyboardEvent) { @@ -612,10 +610,8 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. } // Augment the search action details object. let details = searchActionDetails || {}; - details.isOneOff = isOneOff; details.type = eventType; - BrowserSearch.recordSearchInTelemetry(engine, "urlbar", details); let submission = engine.getSubmission(query, null, "keyword"); return [submission.uri.spec, submission.postData]; ]]></body> @@ -1289,12 +1285,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. var searchBar = BrowserSearch.searchBar; var popupForSearchBar = searchBar && searchBar.textbox == this.mInput; - if (popupForSearchBar) { - searchBar.telemetrySearchDetails = { - index: controller.selection.currentIndex, - kind: "mouse" - }; - } // Check for unmodified left-click, and use default behavior if (aEvent.button == 0 && !aEvent.shiftKey && !aEvent.ctrlKey && @@ -1437,12 +1427,10 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. <body><![CDATA[ this._oneOffSearchesEnabled = enable; if (enable) { - this.oneOffSearchButtons.telemetryOrigin = "urlbar"; this.oneOffSearchButtons.style.display = "-moz-box"; this.oneOffSearchButtons.popup = this; this.oneOffSearchButtons.textbox = this.input; } else { - this.oneOffSearchButtons.telemetryOrigin = null; this.oneOffSearchButtons.style.display = "none"; this.oneOffSearchButtons.popup = null; this.oneOffSearchButtons.textbox = null; diff --git a/basilisk/base/jar.mn b/basilisk/base/jar.mn index 464032f..d5db399 100644 --- a/basilisk/base/jar.mn +++ b/basilisk/base/jar.mn @@ -71,9 +71,6 @@ browser.jar: * content/browser/browser-places.js (content/browser-places.js) content/browser/browser-plugins.js (content/browser-plugins.js) content/browser/browser-refreshblocker.js (content/browser-refreshblocker.js) -#ifdef MOZ_SAFE_BROWSING - content/browser/browser-safebrowsing.js (content/browser-safebrowsing.js) -#endif content/browser/browser-sidebar.js (content/browser-sidebar.js) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) #ifdef MOZ_CAN_DRAW_IN_TITLEBAR @@ -82,7 +79,6 @@ browser.jar: content/browser/browser-tabsintitlebar.js (content/browser-tabsintitlebar-stub.js) #endif content/browser/browser-thumbnails.js (content/browser-thumbnails.js) - content/browser/browser-trackingprotection.js (content/browser-trackingprotection.js) content/browser/tab-content.js (content/tab-content.js) content/browser/content.js (content/content.js) content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) @@ -155,10 +151,5 @@ browser.jar: # the following files are browser-specific overrides * content/browser/license.html (/platform/toolkit/content/license.html) % override chrome://global/content/license.html chrome://browser/content/license.html -#ifdef MOZ_SAFE_BROWSING - content/browser/report-phishing-overlay.xul (content/report-phishing-overlay.xul) - content/browser/blockedSite.xhtml (content/blockedSite.xhtml) -% overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul -#endif % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml diff --git a/basilisk/branding/official/LICENSE b/basilisk/branding/official/LICENSE index 8833fe2..72a4bdc 100644 --- a/basilisk/branding/official/LICENSE +++ b/basilisk/branding/official/LICENSE @@ -1,10 +1,10 @@ This location contains official branding for the Basilisk browser. Please note that you are not granted any trademark rights or licenses -to the trademarks of Moonchild Productions or any other party, +to the trademarks of Moonchild Productions, the Basilisk Development Team, or any other party, including without limitation the Basilisk name or logo. -These branding materials are Copyrighted (c) M. Straver. All rights reserved. +These branding materials are Copyrighted (c) the Basilisk Development Team. All rights reserved. Official branding using these files is only allowed by the copyright holder -or by third parties with express permission from the copyright holder.
\ No newline at end of file +or by third parties with express permission from the copyright holder. diff --git a/basilisk/branding/official/branding.nsi b/basilisk/branding/official/branding.nsi index 250abd8..ffa6bc0 100644 --- a/basilisk/branding/official/branding.nsi +++ b/basilisk/branding/official/branding.nsi @@ -9,7 +9,7 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. !define BrandFullNameInternal "Basilisk" -!define CompanyName "Moonchild Productions" +!define CompanyName "Basilisk Development Team" !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" !define HelpLink "https://www.basilisk-browser.org/contact.shtml" diff --git a/basilisk/branding/official/locales/en-US/brand.dtd b/basilisk/branding/official/locales/en-US/brand.dtd index 1d2ac79..4289fdd 100644 --- a/basilisk/branding/official/locales/en-US/brand.dtd +++ b/basilisk/branding/official/locales/en-US/brand.dtd @@ -5,6 +5,6 @@ <!ENTITY brandShorterName "Basilisk"> <!ENTITY brandShortName "Basilisk"> <!ENTITY brandFullName "Basilisk"> -<!ENTITY vendorShortName "Moonchild"> -<!ENTITY vendorFullName "Moonchild Productions"> -<!ENTITY trademarkInfo.part1 "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Moonchild Productions."> +<!ENTITY vendorShortName "Basilisk-Dev"> +<!ENTITY vendorFullName "Basilisk-Dev"> +<!ENTITY trademarkInfo.part1 "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of the Basilisk Development Team."> diff --git a/basilisk/branding/official/locales/en-US/brand.properties b/basilisk/branding/official/locales/en-US/brand.properties index 9bdb667..e7fb77b 100644 --- a/basilisk/branding/official/locales/en-US/brand.properties +++ b/basilisk/branding/official/locales/en-US/brand.properties @@ -5,7 +5,7 @@ brandShorterName=Basilisk brandShortName=Basilisk brandFullName=Basilisk -vendorShortName=Moonchild +vendorShortName=Basilisk-Dev homePageSingleStartMain=Internal home page with search. homePageImport=Import your home page from %S diff --git a/basilisk/branding/shared/uaoverrides.inc b/basilisk/branding/shared/uaoverrides.inc index 3c7df71..1cc180f 100644 --- a/basilisk/branding/shared/uaoverrides.inc +++ b/basilisk/branding/shared/uaoverrides.inc @@ -9,27 +9,73 @@ #define GK_SLICE Gecko/20100101
#define FX_SLICE Firefox/@GK_VERSION@
-// %OS_SLICE% macro is resolved at runtime, see MoonchildProductions/UXP#1473
+// %OS_SLICE% macro is resolved at runtime, see MoonchildProductions/UXP/issues/1473
-// Mozilla overrides
-pref("@GUAO_PREF@.accounts.firefox.com", "Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
-pref("@GUAO_PREF@.addons.mozilla.org", "Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+// Special-case AMO
+// We send the native UA slice now, since they no longer offer any compatible extensions for us.
+// This will result in an "only with Firefox" message which suits us fine, because it's the truth.
+pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
-// Required for domains that have proven unresponsive to requests from users (notice a trend...? ;) )
-pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:62.0) @GK_SLICE@ Firefox/62.0 @APP_SLICE@");
-pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @APP_SLICE@");
-pref("@GUAO_PREF@.studio.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/68.0 @APP_SLICE@");
-pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (Windows NT 6.1; rv:42.0) @GK_SLICE@ Firefox/42.0 @APP_SLICE@");
-pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (Windows NT 6.1; rv:42.0) @GK_SLICE@ Firefox/42.0 @APP_SLICE@");
+// Required for domains that are unresponsive to requests from users (or likely to be)
+pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (%OS_SLICE% rv:79.0) @GK_SLICE@ Firefox/79.0");
+pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (%OS_SLICE% rv:68.9) @GK_SLICE@ Firefox/68.9 (Basilisk)");
pref("@GUAO_PREF@.google.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @APP_SLICE@");
-pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (%OS_SLICE% rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9");
+pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (%OS_SLICE% rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @APP_SLICE@");
+pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @APP_SLICE@");
+pref("@GUAO_PREF@.kroger.com","Mozilla/5.0 (%OS_SLICE% rv:86.0) @GK_SLICE@ Firefox/86.0 (Basilisk)");
+pref("@GUAO_PREF@.live.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.netteller.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.patientaccess.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0 @APP_SLICE@");
+pref("@GUAO_PREF@.outlook.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.vimeo.com", "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) EdgiOS/102.0.1245.30 Version/15.0 Mobile/15E148 Safari/604.1");
+pref("@GUAO_PREF@.web.de","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9");
+pref("@GUAO_PREF@.calendar.yahoo.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+// For Amazon Prime videos
+pref("@GUAO_PREF@.www.amazon.com","Mozilla/5.0 (%OS_SLICE% rv:45.9) @GK_SLICE@ Firefox/45.9 (Basilisk)");
+// Soundcloud uses Firefox-exclusive combinations of code. Never pass Firefox slice.
+pref("@GUAO_PREF@.soundcloud.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
// Daily motion only likes strict Firefox UAs
pref("@GUAO_PREF@.dailymotion.com","Mozilla/5.0 (%OS_SLICE% rv:52.0) @GK_SLICE@ Firefox/52.0");
+pref("@GUAO_PREF@.players.brightcove.net","Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
+// Google fonts serves physically different fonts to later Firefox versions that render incorrectly unless on Gecko
+pref("@GUAO_PREF@.fonts.googleapis.com", "Mozilla/5.0 (%OS_SLICE% rv:61.9) Gecko/20100101 Firefox/61.9");
+
+// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc.
+pref("@GUAO_PREF@.deviantart.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.deviantart.net","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.altibox.dk","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.altibox.no","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.firefox.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.mozilla.org","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.mozilla.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.github.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.spotify.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+pref("@GUAO_PREF@.twitter.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @APP_SLICE@");
+
+// UA-Sniffing domains below have indicated no interest in supporting Basilisk (BOO!)
+pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Basilisk)");
+pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (%OS_SLICE% rv:38.0) @GK_SLICE@ Firefox/38.0");
+pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ Firefox/68.0 SeaMonkey/2.53.12");
+pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (Windows NT 6.1; rv:45.9) @GK_SLICE@ Firefox/45.9");
+pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (Windows NT 6.1; rv:45.9) @GK_SLICE@ Firefox/45.9");
+pref("@GUAO_PREF@.mewe.com", "Mozilla/5.0 (%OS_SLICE% rv:102.0) Gecko/20100101 Firefox/102.0");
// UA-sniffing domains that are "app/vendor-specific" and do not like Basilisk
-pref("@GUAO_PREF@.whatsapp.com","Mozilla/5.0 (%OS_SLICE% rv:61.0) @GK_SLICE@ Firefox/61.0");
+pref("@GUAO_PREF@.web.whatsapp.com","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36");
+pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0");
+pref("@GUAO_PREF@.studio.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/68.0 @APP_SLICE@");
+pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0");
// The following domains do not like the Goanna slice
pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
pref("@GUAO_PREF@.yuku.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ @APP_SLICE@");
+
+// Domains Basilisk overrides that are not in the Pale Moon overrides
+pref("@GUAO_PREF@.slack.com","Mozilla/5.0 (%OS_SLICE% rv:100.0) @GK_SLICE@ Firefox/100.0 @APP_SLICE@");
+
+// ============================================================================
diff --git a/basilisk/branding/unofficial/branding.nsi b/basilisk/branding/unofficial/branding.nsi index 586dd00..5afe193 100644 --- a/basilisk/branding/unofficial/branding.nsi +++ b/basilisk/branding/unofficial/branding.nsi @@ -9,7 +9,7 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. !define BrandFullNameInternal "Serpent" -!define CompanyName "Moonchild Productions" +!define CompanyName "Basilisk Development Team" !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org" !define HelpLink "https://forum.palemoon.org" diff --git a/basilisk/branding/unofficial/locales/en-US/brand.dtd b/basilisk/branding/unofficial/locales/en-US/brand.dtd index 17c2436..d10cf29 100644 --- a/basilisk/branding/unofficial/locales/en-US/brand.dtd +++ b/basilisk/branding/unofficial/locales/en-US/brand.dtd @@ -5,6 +5,6 @@ <!ENTITY brandShorterName "Serpent"> <!ENTITY brandShortName "Serpent"> <!ENTITY brandFullName "Serpent"> -<!ENTITY vendorShortName "Moonchild"> -<!ENTITY vendorFullName "Moonchild Productions"> +<!ENTITY vendorShortName "Basilisk-Dev"> +<!ENTITY vendorFullName "Basilisk-Dev"> <!ENTITY trademarkInfo.part1 " "> diff --git a/basilisk/branding/unofficial/locales/en-US/brand.properties b/basilisk/branding/unofficial/locales/en-US/brand.properties index 80349f0..f3fd5df 100644 --- a/basilisk/branding/unofficial/locales/en-US/brand.properties +++ b/basilisk/branding/unofficial/locales/en-US/brand.properties @@ -5,7 +5,7 @@ brandShorterName=Serpent brandShortName=Serpent brandFullName=Serpent -vendorShortName=Moonchild -vendorFullName=Moonchild Productions +vendorShortName=Basilisk-Dev +vendorFullName=Basilisk-Dev syncBrandShortName=Sync diff --git a/basilisk/components/about/AboutRedirector.cpp b/basilisk/components/about/AboutRedirector.cpp index d52b063..db6a65b 100644 --- a/basilisk/components/about/AboutRedirector.cpp +++ b/basilisk/components/about/AboutRedirector.cpp @@ -40,15 +40,6 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, -#ifdef MOZ_SAFE_BROWSING - { - "blocked", "chrome://browser/content/blockedSite.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_CAN_LOAD_IN_CHILD | - nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::HIDE_FROM_ABOUTABOUT - }, -#endif { "certerror", "chrome://browser/content/aboutNetError.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | diff --git a/basilisk/components/build/nsModule.cpp b/basilisk/components/build/nsModule.cpp index 3fdde88..bba2563 100644 --- a/basilisk/components/build/nsModule.cpp +++ b/basilisk/components/build/nsModule.cpp @@ -86,9 +86,6 @@ static const mozilla::Module::ContractIDEntry kBrowserContracts[] = { #endif { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "basilisk", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#ifdef MOZ_SAFE_BROWSING - { NS_ABOUT_MODULE_CONTRACTID_PREFIX "blocked", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, -#endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "certerror", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "tabcrashed", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, { NS_ABOUT_MODULE_CONTRACTID_PREFIX "feeds", &kNS_BROWSER_ABOUT_REDIRECTOR_CID }, diff --git a/basilisk/components/controlcenter/content/panel.inc.xul b/basilisk/components/controlcenter/content/panel.inc.xul index 361b3c9..7f5793c 100644 --- a/basilisk/components/controlcenter/content/panel.inc.xul +++ b/basilisk/components/controlcenter/content/panel.inc.xul @@ -54,37 +54,6 @@ oncommand="gIdentityHandler.toggleSubView('security', this)"/> </hbox> - <!-- Tracking Protection Section --> - <hbox id="tracking-protection-container" - class="identity-popup-section" - when-connection="not-secure secure secure-ev secure-cert-user-overridden file"> - <vbox id="tracking-protection-content" flex="1"> - <description class="identity-popup-headline" - crop="end" - value="&trackingProtection.title;" /> - - <label id="tracking-blocked" - crop="end">&trackingProtection.detectedBlocked3;</label> - <label id="tracking-loaded" - crop="end">&trackingProtection.detectedNotBlocked3;</label> - <label id="tracking-not-detected" - crop="end">&trackingProtection.notDetected3;</label> - - <button id="tracking-action-unblock" - label="&trackingProtection.unblock.label;" - accesskey="&trackingProtection.unblock.accesskey;" - oncommand="TrackingProtection.disableForCurrentPage();" /> - <button id="tracking-action-unblock-private" - label="&trackingProtection.unblockPrivate.label;" - accesskey="&trackingProtection.unblockPrivate.accesskey;" - oncommand="TrackingProtection.disableForCurrentPage();" /> - <button id="tracking-action-block" - label="&trackingProtection.block2.label;" - accesskey="&trackingProtection.block2.accesskey;" - oncommand="TrackingProtection.enableForCurrentPage();" /> - </vbox> - </hbox> - <!-- Permissions Section --> <hbox class="identity-popup-section"> <vbox id="identity-popup-permissions-content" flex="1"> diff --git a/basilisk/components/migration/AutoMigrate.jsm b/basilisk/components/migration/AutoMigrate.jsm index 003f70d..93f1612 100644 --- a/basilisk/components/migration/AutoMigrate.jsm +++ b/basilisk/components/migration/AutoMigrate.jsm @@ -93,30 +93,20 @@ const AutoMigrate = { * failed for some reason. */ migrate(profileStartup, migratorKey, profileToMigrate) { - let histogram = Services.telemetry.getHistogramById( - "FX_STARTUP_MIGRATION_AUTOMATED_IMPORT_PROCESS_SUCCESS"); - histogram.add(0); let {migrator, pickedKey} = this.pickMigrator(migratorKey); - histogram.add(5); profileToMigrate = this.pickProfile(migrator, profileToMigrate); - histogram.add(10); let resourceTypes = migrator.getMigrateData(profileToMigrate, profileStartup); if (!(resourceTypes & this.resourceTypesToUse)) { throw new Error("No usable resources were found for the selected browser!"); } - histogram.add(15); let sawErrors = false; let migrationObserver = (subject, topic) => { if (topic == "Migration:ItemError") { sawErrors = true; } else if (topic == "Migration:Ended") { - histogram.add(25); - if (sawErrors) { - histogram.add(26); - } Services.obs.removeObserver(migrationObserver, "Migration:Ended"); Services.obs.removeObserver(migrationObserver, "Migration:ItemError"); Services.prefs.setCharPref(kAutoMigrateBrowserPref, pickedKey); @@ -132,7 +122,6 @@ const AutoMigrate = { Services.obs.addObserver(migrationObserver, "Migration:Ended", false); Services.obs.addObserver(migrationObserver, "Migration:ItemError", false); migrator.migrate(this.resourceTypesToUse, profileStartup, profileToMigrate); - histogram.add(20); }, /** @@ -209,50 +198,35 @@ const AutoMigrate = { undo: Task.async(function* () { let browserId = Preferences.get(kAutoMigrateBrowserPref, "unknown"); - let histogram = Services.telemetry.getHistogramById("FX_STARTUP_MIGRATION_AUTOMATED_IMPORT_UNDO"); - histogram.add(0); if (!(yield this.canUndo())) { - histogram.add(5); throw new Error("Can't undo!"); } this._pendingUndoTasks = true; this._removeNotificationBars(); - histogram.add(10); let readPromise = OS.File.read(kUndoStateFullPath, { encoding: "utf-8", compression: "lz4", }); let stateData = this._dejsonifyUndoState(yield readPromise); - histogram.add(12); this._errorMap = {bookmarks: 0, visits: 0, logins: 0}; - let reportErrorTelemetry = (type) => { - let histogramId = `FX_STARTUP_MIGRATION_UNDO_${type.toUpperCase()}_ERRORCOUNT`; - Services.telemetry.getKeyedHistogramById(histogramId).add(browserId, this._errorMap[type]); - }; yield this._removeUnchangedBookmarks(stateData.get("bookmarks")).catch(ex => { Cu.reportError("Uncaught exception when removing unchanged bookmarks!"); Cu.reportError(ex); }); - reportErrorTelemetry("bookmarks"); - histogram.add(15); yield this._removeSomeVisits(stateData.get("visits")).catch(ex => { Cu.reportError("Uncaught exception when removing history visits!"); Cu.reportError(ex); }); - reportErrorTelemetry("visits"); - histogram.add(20); yield this._removeUnchangedLogins(stateData.get("logins")).catch(ex => { Cu.reportError("Uncaught exception when removing unchanged logins!"); Cu.reportError(ex); }); - reportErrorTelemetry("logins"); - histogram.add(25); // This is async, but no need to wait for it. NewTabUtils.links.populateCache(() => { @@ -260,7 +234,6 @@ const AutoMigrate = { }, true); this._purgeUndoState(this.UNDO_REMOVED_REASON_UNDO_USED); - histogram.add(30); }), _removeNotificationBars() { @@ -288,10 +261,6 @@ const AutoMigrate = { let migrationBrowser = Preferences.get(kAutoMigrateBrowserPref, "unknown"); Services.prefs.clearUserPref(kAutoMigrateBrowserPref); - - let histogram = - Services.telemetry.getKeyedHistogramById("FX_STARTUP_MIGRATION_UNDO_REASON"); - histogram.add(migrationBrowser, reason); }, getBrowserUsedForMigration() { @@ -367,7 +336,6 @@ const AutoMigrate = { message, kNotificationId, null, notificationBox.PRIORITY_INFO_HIGH, buttons ); let remainingDays = Preferences.get(kAutoMigrateDaysToOfferUndoPref, 0); - Services.telemetry.getHistogramById("FX_STARTUP_MIGRATION_UNDO_OFFERED").add(4 - remainingDays); }), shouldStillShowUndoPrompt() { diff --git a/basilisk/components/migration/FirefoxProfileMigrator.js b/basilisk/components/migration/FirefoxProfileMigrator.js index 2714cdb..b53f7b5 100644 --- a/basilisk/components/migration/FirefoxProfileMigrator.js +++ b/basilisk/components/migration/FirefoxProfileMigrator.js @@ -1,6 +1,5 @@ /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- - * vim: sw=2 ts=2 sts=2 et */ - /* This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ @@ -170,77 +169,8 @@ FirefoxProfileMigrator.prototype._getResourcesInternal = function(sourceProfileD }; } - // Telemetry related migrations. - let times = { - name: "times", // name is used only by tests. - type: types.OTHERDATA, - migrate: aCallback => { - let file = this._getFileObject(sourceProfileDir, "times.json"); - if (file) { - file.copyTo(currentProfileDir, ""); - } - // And record the fact a migration (ie, a reset) happened. - let timesAccessor = new ProfileAge(currentProfileDir.path); - timesAccessor.recordProfileReset().then( - () => aCallback(true), - () => aCallback(false) - ); - } - }; - let telemetry = { - name: "telemetry", // name is used only by tests... - type: types.OTHERDATA, - migrate: aCallback => { - let createSubDir = (name) => { - let dir = currentProfileDir.clone(); - dir.append(name); - dir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); - return dir; - }; - - // If the 'datareporting' directory exists we migrate files from it. - let haveStateFile = false; - let dataReportingDir = this._getFileObject(sourceProfileDir, "datareporting"); - if (dataReportingDir && dataReportingDir.isDirectory()) { - // Copy only specific files. - let toCopy = ["state.json", "session-state.json"]; - - let dest = createSubDir("datareporting"); - let enumerator = dataReportingDir.directoryEntries; - while (enumerator.hasMoreElements()) { - let file = enumerator.getNext().QueryInterface(Ci.nsIFile); - if (file.isDirectory() || toCopy.indexOf(file.leafName) == -1) { - continue; - } - - if (file.leafName == "state.json") { - haveStateFile = true; - } - file.copyTo(dest, ""); - } - } - - if (!haveStateFile) { - // Fall back to migrating the state file that contains the client id from healthreport/. - // We first moved the client id management from the FHR implementation to the datareporting - // service. - // Consequently, we try to migrate an existing FHR state file here as a fallback. - let healthReportDir = this._getFileObject(sourceProfileDir, "healthreport"); - if (healthReportDir && healthReportDir.isDirectory()) { - let stateFile = this._getFileObject(healthReportDir, "state.json"); - if (stateFile) { - let dest = createSubDir("healthreport"); - stateFile.copyTo(dest, ""); - } - } - } - - aCallback(true); - } - }; - return [places, cookies, passwords, formData, dictionary, bookmarksBackups, - session, times, telemetry].filter(r => r); + session].filter(r => r); }; Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", { diff --git a/basilisk/components/migration/MigrationUtils.jsm b/basilisk/components/migration/MigrationUtils.jsm index 9425cce..2bb7787 100644 --- a/basilisk/components/migration/MigrationUtils.jsm +++ b/basilisk/components/migration/MigrationUtils.jsm @@ -265,27 +265,6 @@ this.MigratorPrototype = { let maybeFinishResponsivenessMonitor = (responsivenessMonitor, histogramId) => { if (responsivenessMonitor) { let accumulatedDelay = responsivenessMonitor.finish(); - if (histogramId) { - try { - Services.telemetry.getKeyedHistogramById(histogramId) - .add(browserKey, accumulatedDelay); - } catch (ex) { - Cu.reportError(histogramId + ": " + ex); - } - } - } - }; - - let collectQuantityTelemetry = () => { - for (let resourceType of Object.keys(MigrationUtils._importQuantities)) { - let histogramId = - "FX_MIGRATION_" + resourceType.toUpperCase() + "_QUANTITY"; - try { - Services.telemetry.getKeyedHistogramById(histogramId) - .add(browserKey, MigrationUtils._importQuantities[resourceType]); - } catch (ex) { - Cu.reportError(histogramId + ": " + ex); - } } }; @@ -331,7 +310,6 @@ this.MigratorPrototype = { maybeFinishResponsivenessMonitor(responsivenessMonitor, responsivenessHistogramId); if (resourcesGroupedByItems.size == 0) { - collectQuantityTelemetry(); notify("Migration:Ended"); } } @@ -803,7 +781,6 @@ this.MigrationUtils = Object.freeze({ * - {String} an identifier for the profile to use when migrating * NB: If you add new consumers, please add a migration entry point * constant below, and specify at least the first element of the array - * (the migration entry point for purposes of telemetry). */ showMigrationWizard: function MU_showMigrationWizard(aOpener, aParams) { @@ -1096,7 +1073,4 @@ this.MigrationUtils = Object.freeze({ "safari": 8, "360se": 9, }, - getSourceIdForTelemetry(sourceName) { - return this._sourceNameToIdMapping[sourceName] || 0; - }, }); diff --git a/basilisk/components/migration/content/migration.js b/basilisk/components/migration/content/migration.js index eb21756..8ca60a3 100644 --- a/basilisk/components/migration/content/migration.js +++ b/basilisk/components/migration/content/migration.js @@ -35,7 +35,6 @@ var MigrationWizard = { /* exported MigrationWizard */ let args = window.arguments; let entryPointId = args[0] || MigrationUtils.MIGRATION_ENTRYPOINT_UNKNOWN; - Services.telemetry.getHistogramById("FX_MIGRATION_ENTRY_POINT").add(entryPointId); this.isInitialMigration = entryPointId == MigrationUtils.MIGRATION_ENTRYPOINT_FIRSTRUN; if (args.length > 1) { @@ -105,15 +104,6 @@ var MigrationWizard = { /* exported MigrationWizard */ } } } - if (this.isInitialMigration) { - Services.telemetry.getHistogramById("FX_STARTUP_MIGRATION_BROWSER_COUNT") - .add(this._availableMigrators.length); - let defaultBrowser = MigrationUtils.getMigratorKeyForDefaultBrowser(); - // This will record 0 for unknown default browser IDs. - defaultBrowser = MigrationUtils.getSourceIdForTelemetry(defaultBrowser); - Services.telemetry.getHistogramById("FX_STARTUP_MIGRATION_EXISTING_DEFAULT_BROWSER") - .add(defaultBrowser); - } group.addEventListener("command", toggleCloseBrowserWarning); @@ -142,11 +132,6 @@ var MigrationWizard = { /* exported MigrationWizard */ var newSource = document.getElementById("importSourceGroup").selectedItem.id; if (newSource == "nothing") { - // Need to do telemetry here because we're closing the dialog before we get to - // do actual migration. For actual migration, this doesn't happen until after - // migration takes place. - Services.telemetry.getHistogramById("FX_MIGRATION_SOURCE_BROWSER") - .add(MigrationUtils.getSourceIdForTelemetry("nothing")); document.documentElement.cancel(); return false; } @@ -366,21 +351,6 @@ var MigrationWizard = { /* exported MigrationWizard */ onMigratingMigrate: function () { this._migrator.migrate(this._itemsFlags, this._autoMigrate, this._selectedProfile); - - Services.telemetry.getHistogramById("FX_MIGRATION_SOURCE_BROWSER") - .add(MigrationUtils.getSourceIdForTelemetry(this._source)); - if (!this._autoMigrate) { - let hist = Services.telemetry.getKeyedHistogramById("FX_MIGRATION_USAGE"); - let exp = 0; - let items = this._itemsFlags; - while (items) { - if (items & 1) { - hist.add(this._source, exp); - } - items = items >> 1; - exp++; - } - } }, _listItems: function (aID) @@ -426,18 +396,8 @@ var MigrationWizard = { /* exported MigrationWizard */ label.removeAttribute("style"); break; case "Migration:Ended": - if (this.isInitialMigration) { - // Ensure errors in reporting data recency do not affect the rest of the migration. - try { - this.reportDataRecencyTelemetry(); - } catch (ex) { - Cu.reportError(ex); - } - } if (this._autoMigrate) { let hasImportedHomepage = !!(this._newHomePage && this._newHomePage != "DEFAULT"); - Services.telemetry.getKeyedHistogramById("FX_MIGRATION_IMPORTED_HOMEPAGE") - .add(this._source, hasImportedHomepage); if (this._newHomePage) { try { // set homepage properly @@ -508,8 +468,6 @@ var MigrationWizard = { /* exported MigrationWizard */ Cc["@mozilla.org/consoleservice;1"] .getService(Ci.nsIConsoleService) .logStringMessage("some " + type + " did not successfully migrate."); - Services.telemetry.getKeyedHistogramById("FX_MIGRATION_ERRORS") - .add(this._source, Math.log2(numericType)); break; } }, @@ -521,29 +479,4 @@ var MigrationWizard = { /* exported MigrationWizard */ this._listItems("doneItems"); }, - reportDataRecencyTelemetry() { - let histogram = Services.telemetry.getKeyedHistogramById("FX_STARTUP_MIGRATION_DATA_RECENCY"); - let lastUsedPromises = []; - for (let [key, migrator] of this._availableMigrators) { - // No block-scoped let in for...of loop conditions, so get the source: - let localKey = key; - lastUsedPromises.push(migrator.getLastUsedDate().then(date => { - const ONE_YEAR = 24 * 365; - let diffInHours = Math.round((Date.now() - date) / (60 * 60 * 1000)); - if (diffInHours > ONE_YEAR) { - diffInHours = ONE_YEAR; - } - histogram.add(localKey, diffInHours); - return [localKey, diffInHours]; - })); - } - Promise.all(lastUsedPromises).then(migratorUsedTimeDiff => { - // Sort low to high. - migratorUsedTimeDiff.sort(([keyA, diffA], [keyB, diffB]) => diffA - diffB); /* eslint no-unused-vars: off */ - let usedMostRecentBrowser = migratorUsedTimeDiff.length && this._source == migratorUsedTimeDiff[0][0]; - let usedRecentBrowser = - Services.telemetry.getKeyedHistogramById("FX_STARTUP_MIGRATION_USED_RECENT_BROWSER"); - usedRecentBrowser.add(this._source, usedMostRecentBrowser); - }); - }, }; diff --git a/basilisk/components/nsBrowserContentHandler.js b/basilisk/components/nsBrowserContentHandler.js index 841d7a4..97c9c28 100644 --- a/basilisk/components/nsBrowserContentHandler.js +++ b/basilisk/components/nsBrowserContentHandler.js @@ -236,9 +236,6 @@ function openPreferences() { } function logSystemBasedSearch(engine) { - var countId = (engine.identifier || ("other-" + engine.name)) + ".system"; - var count = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS"); - count.add(countId); } function doSearch(searchTerm, cmdLine) { @@ -688,18 +685,6 @@ nsDefaultCommandLineHandler.prototype = { /* nsICommandLineHandler */ handle : function(cmdLine) { - // The -url flag is inserted by the operating system when the default - // application handler is used. We check for default browser to remove - // instances where users explicitly decide to "open with" the browser. - // Note that users who launch firefox manually with the -url flag will - // get erroneously counted. - try { - if (cmdLine.findFlag("url", false) && - ShellService.isDefaultBrowser(false, false)) { - Services.telemetry.getHistogramById("FX_STARTUP_EXTERNAL_CONTENT_HANDLER").add(); - } - } catch (e) {} - var urilist = []; if (AppConstants.platform == "win") { diff --git a/basilisk/components/nsBrowserGlue.js b/basilisk/components/nsBrowserGlue.js index 7446d11..2b2daeb 100644 --- a/basilisk/components/nsBrowserGlue.js +++ b/basilisk/components/nsBrowserGlue.js @@ -27,7 +27,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s ["AutoCompletePopup", "resource://gre/modules/AutoCompletePopup.jsm"], ["BookmarkHTMLUtils", "resource://gre/modules/BookmarkHTMLUtils.jsm"], ["BookmarkJSONUtils", "resource://gre/modules/BookmarkJSONUtils.jsm"], - ["BrowserUsageTelemetry", "resource:///modules/BrowserUsageTelemetry.jsm"], ["ContentClick", "resource:///modules/ContentClick.jsm"], ["ContentPrefServiceParent", "resource://gre/modules/ContentPrefServiceParent.jsm"], ["ContentSearch", "resource:///modules/ContentSearch.jsm"], @@ -308,8 +307,6 @@ BrowserGlue.prototype = { } catch (ex) { Cu.reportError(ex); } - let win = RecentWindow.getMostRecentBrowserWindow(); - win.BrowserSearch.recordSearchInTelemetry(engine, "urlbar"); break; case "browser-search-engine-modified": // Ensure we cleanup the hiddenOneOffs pref when removing @@ -340,7 +337,6 @@ BrowserGlue.prototype = { }); break; case "autocomplete-did-enter-text": - this._handleURLBarTelemetry(subject.QueryInterface(Ci.nsIAutoCompleteInput)); break; case "test-initialize-sanitizer": this._sanitizer.onStartup(); @@ -351,64 +347,6 @@ BrowserGlue.prototype = { } }, - _handleURLBarTelemetry(input) { - if (!input || - input.id != "urlbar" || - input.inPrivateContext || - input.popup.selectedIndex < 0) { - return; - } - let controller = - input.popup.view.QueryInterface(Ci.nsIAutoCompleteController); - let idx = input.popup.selectedIndex; - let value = controller.getValueAt(idx); - let action = input._parseActionUrl(value); - let actionType; - if (action) { - actionType = - action.type == "searchengine" && action.params.searchSuggestion ? - "searchsuggestion" : - action.type; - } - if (!actionType) { - let styles = new Set(controller.getStyleAt(idx).split(/\s+/)); - let style = ["autofill", "tag", "bookmark"].find(s => styles.has(s)); - actionType = style || "history"; - } - - Services.telemetry - .getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX") - .add(idx); - - // Ideally this would be a keyed histogram and we'd just add(actionType), - // but keyed histograms aren't currently shown on the telemetry dashboard - // (bug 1151756). - // - // You can add values but don't change any of the existing values. - // Otherwise you'll break our data. - let buckets = { - autofill: 0, - bookmark: 1, - history: 2, - keyword: 3, - searchengine: 4, - searchsuggestion: 5, - switchtab: 6, - tag: 7, - visiturl: 8, - remotetab: 9, - extension: 10, - }; - if (actionType in buckets) { - Services.telemetry - .getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE") - .add(buckets[actionType]); - } else { - Cu.reportError("Unknown FX_URLBAR_SELECTED_RESULT_TYPE type: " + - actionType); - } - }, - // initialization (called on application startup) _init: function() { let os = Services.obs; @@ -436,9 +374,6 @@ BrowserGlue.prototype = { os.addObserver(this, "distribution-customization-complete", false); os.addObserver(this, "handle-xul-text-link", false); os.addObserver(this, "profile-before-change", false); - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - os.addObserver(this, "keyword-search", false); - } os.addObserver(this, "browser-search-engine-modified", false); os.addObserver(this, "restart-in-safe-mode", false); os.addObserver(this, "flash-plugin-hang", false); @@ -490,9 +425,6 @@ BrowserGlue.prototype = { os.removeObserver(this, "places-database-locked"); os.removeObserver(this, "handle-xul-text-link"); os.removeObserver(this, "profile-before-change"); - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - os.removeObserver(this, "keyword-search"); - } os.removeObserver(this, "browser-search-engine-modified"); os.removeObserver(this, "flash-plugin-hang"); os.removeObserver(this, "xpi-signature-changed"); @@ -531,10 +463,6 @@ BrowserGlue.prototype = { const STATE_USER_PICKED_IGNORE_FOREVER = 3; const STATE_USER_CLOSED_NOTIFICATION = 4; - let update = function(response) { - Services.telemetry.getHistogramById("SLOW_ADDON_WARNING_STATES").add(response); - } - let complete = false; let start = Date.now(); let done = function(response) { @@ -543,12 +471,8 @@ BrowserGlue.prototype = { return; } complete = true; - update(response); - Services.telemetry.getHistogramById("SLOW_ADDON_WARNING_RESPONSE_TIME").add(Date.now() - start); }; - update(STATE_WARNING_DISPLAYED); - if (notification) { notification.label = message; } else { @@ -659,7 +583,6 @@ BrowserGlue.prototype = { NewTabMessages.init(); SessionStore.init(); - BrowserUsageTelemetry.init(); ContentSearch.init(); FormValidationHandler.init(); @@ -874,27 +797,6 @@ BrowserGlue.prototype = { nb.PRIORITY_WARNING_MEDIUM, buttons); }, - _firstWindowTelemetry: function(aWindow) { - let SCALING_PROBE_NAME = ""; - switch (AppConstants.platform) { - case "win": - SCALING_PROBE_NAME = "DISPLAY_SCALING_MSWIN"; - break; - case "macosx": - SCALING_PROBE_NAME = "DISPLAY_SCALING_OSX"; - break; - case "linux": - SCALING_PROBE_NAME = "DISPLAY_SCALING_LINUX"; - break; - } - if (SCALING_PROBE_NAME) { - let scaling = aWindow.devicePixelRatio * 100; - try { - Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling); - } catch (ex) {} - } - }, - // the first browser window has finished initializing _onFirstWindowLoaded: function(aWindow) { // Initialize PdfJs when running in-process and remote. This only @@ -975,7 +877,6 @@ BrowserGlue.prototype = { AutoCompletePopup.init(); DateTimePickerHelper.init(); - this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); }, @@ -1002,7 +903,6 @@ BrowserGlue.prototype = { delete this._bookmarksBackupIdleTime; } - BrowserUsageTelemetry.uninit(); UserAgentOverrides.uninit(); PageThumbs.uninit(); NewTabMessages.uninit(); @@ -1122,20 +1022,6 @@ BrowserGlue.prototype = { Services.prefs.setIntPref("browser.shell.defaultBrowserCheckCount", promptCount); } - try { - // Report default browser status on startup to telemetry - // so we can track whether we are the default. - Services.telemetry.getHistogramById("BROWSER_IS_USER_DEFAULT") - .add(isDefault); - Services.telemetry.getHistogramById("BROWSER_IS_USER_DEFAULT_ERROR") - .add(isDefaultError); - Services.telemetry.getHistogramById("BROWSER_SET_DEFAULT_ALWAYS_CHECK") - .add(shouldCheck); - Services.telemetry.getHistogramById("BROWSER_SET_DEFAULT_DIALOG_PROMPT_RAWCOUNT") - .add(promptCount); - } - catch (ex) { /* Don't break the default prompt if telemetry is broken. */ } - if (willPrompt) { Services.tm.mainThread.dispatch(function() { DefaultBrowserCheck.prompt(RecentWindow.getMostRecentBrowserWindow()); @@ -1552,14 +1438,6 @@ BrowserGlue.prototype = { // available backup compared to that session. if (profileLastUse > lastBackupTime) { let backupAge = Math.round((profileLastUse - lastBackupTime) / 86400000); - // Report the age of the last available backup. - try { - Services.telemetry - .getHistogramById("PLACES_BACKUPS_DAYSFROMLAST") - .add(backupAge); - } catch (ex) { - Cu.reportError(new Error("Unable to report telemetry.")); - } if (backupAge > BOOKMARKS_BACKUP_MAX_INTERVAL_DAYS) this._bookmarksBackupIdleTime /= 2; @@ -2408,24 +2286,12 @@ var DefaultBrowserCheck = { if (isDefault || runTime > 600) { this._setAsDefaultTimer.cancel(); this._setAsDefaultTimer = null; - Services.telemetry.getHistogramById("BROWSER_SET_DEFAULT_TIME_TO_COMPLETION_SECONDS") - .add(runTime); } - Services.telemetry.getHistogramById("BROWSER_IS_USER_DEFAULT_ERROR") - .add(isDefaultError); }, 1000, Ci.nsITimer.TYPE_REPEATING_SLACK); } catch (ex) { setAsDefaultError = true; Cu.reportError(ex); } - // Here BROWSER_IS_USER_DEFAULT and BROWSER_SET_USER_DEFAULT_ERROR appear - // to be inverse of each other, but that is only because this function is - // called when the browser is set as the default. During startup we record - // the BROWSER_IS_USER_DEFAULT value without recording BROWSER_SET_USER_DEFAULT_ERROR. - Services.telemetry.getHistogramById("BROWSER_IS_USER_DEFAULT") - .add(!setAsDefaultError); - Services.telemetry.getHistogramById("BROWSER_SET_DEFAULT_ERROR") - .add(setAsDefaultError); }, _createPopup: function(win, notNowStrings, neverStrings) { @@ -2537,12 +2403,6 @@ var DefaultBrowserCheck = { } else if (!shouldAsk.value) { ShellService.shouldCheckDefaultBrowser = false; } - - try { - let resultEnum = rv * 2 + shouldAsk.value; - Services.telemetry.getHistogramById("BROWSER_SET_DEFAULT_RESULT") - .add(resultEnum); - } catch (ex) { /* Don't break if Telemetry is acting up. */ } } }, diff --git a/basilisk/components/places/content/browserPlacesViews.js b/basilisk/components/places/content/browserPlacesViews.js index 2d1a9a2..f8a03c8 100644 --- a/basilisk/components/places/content/browserPlacesViews.js +++ b/basilisk/components/places/content/browserPlacesViews.js @@ -980,9 +980,6 @@ function PlacesToolbar(aPlace) { } PlacesViewBase.call(this, aPlace); - - Services.telemetry.getHistogramById("FX_BOOKMARKS_TOOLBAR_INIT_MS") - .add(Date.now() - startTime); } PlacesToolbar.prototype = { diff --git a/basilisk/components/places/content/places.js b/basilisk/components/places/content/places.js index 30b4b7b..b04aea3 100644 --- a/basilisk/components/places/content/places.js +++ b/basilisk/components/places/content/places.js @@ -17,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils", "resource://gre/modules/DownloadUtils.jsm"); const RESTORE_FILEPICKER_FILTER_EXT = "*.json;*.jsonlz4"; -const HISTORY_LIBRARY_SEARCH_TELEMETRY = "PLACES_HISTORY_LIBRARY_SEARCH_TIME_MS"; var PlacesOrganizer = { _places: null, @@ -360,7 +359,6 @@ var PlacesOrganizer = { * cookies, history, preferences, and bookmarks. */ importFromBrowser: function() { - // We pass in the type of source we're using for use in telemetry: MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PLACES]); }, diff --git a/basilisk/components/preferences/blocklists.js b/basilisk/components/preferences/blocklists.js deleted file mode 100644 index bc39eb6..0000000 --- a/basilisk/components/preferences/blocklists.js +++ /dev/null @@ -1,209 +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/. */ - -Components.utils.import("resource://gre/modules/Services.jsm"); -const BASE_LIST_ID = "base"; -const CONTENT_LIST_ID = "content"; -const TRACK_SUFFIX = "-track-digest256"; -const TRACKING_TABLE_PREF = "urlclassifier.trackingTable"; -const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists."; -const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime"; - -var gBlocklistManager = { - _type: "", - _blockLists: [], - _brandShortName : null, - _bundle: null, - _tree: null, - - _view: { - _rowCount: 0, - get rowCount() { - return this._rowCount; - }, - getCellText: function (row, column) { - if (column.id == "listCol") { - let list = gBlocklistManager._blockLists[row]; - let desc = list.description ? list.description : ""; - let text = gBlocklistManager._bundle.getFormattedString("mozNameTemplate", - [list.name, desc]); - return text; - } - return ""; - }, - - isSeparator: function(index) { return false; }, - isSorted: function() { return false; }, - isContainer: function(index) { return false; }, - setTree: function(tree) {}, - getImageSrc: function(row, column) {}, - getProgressMode: function(row, column) {}, - getCellValue: function(row, column) { - if (column.id == "selectionCol") - return gBlocklistManager._blockLists[row].selected; - return undefined; - }, - cycleHeader: function(column) {}, - getRowProperties: function(row) { return ""; }, - getColumnProperties: function(column) { return ""; }, - getCellProperties: function(row, column) { - if (column.id == "selectionCol") { - return "checkmark"; - } - - return ""; - } - }, - - onWindowKeyPress: function (event) { - if (event.keyCode == KeyEvent.DOM_VK_ESCAPE) { - window.close(); - } else if (event.keyCode == KeyEvent.DOM_VK_RETURN) { - gBlocklistManager.onApplyChanges(); - } - }, - - onLoad: function () { - this._bundle = document.getElementById("bundlePreferences"); - let params = window.arguments[0]; - this.init(params); - }, - - init: function (params) { - if (this._type) { - // reusing an open dialog, clear the old observer - this.uninit(); - } - - this._type = "tracking"; - this._brandShortName = params.brandShortName; - - let blocklistsText = document.getElementById("blocklistsText"); - while (blocklistsText.hasChildNodes()) { - blocklistsText.removeChild(blocklistsText.firstChild); - } - blocklistsText.appendChild(document.createTextNode(params.introText)); - - document.title = params.windowTitle; - - let treecols = document.getElementsByTagName("treecols")[0]; - treecols.addEventListener("click", event => { - if (event.target.nodeName != "treecol" || event.button != 0) { - return; - } - }); - - this._loadBlockLists(); - }, - - uninit: function () {}, - - onListSelected: function () { - for (let list of this._blockLists) { - list.selected = false; - } - this._blockLists[this._tree.currentIndex].selected = true; - - this._updateTree(); - }, - - onApplyChanges: function () { - let activeList = this._getActiveList(); - let selected = null; - for (let list of this._blockLists) { - if (list.selected) { - selected = list; - break; - } - } - - if (activeList !== selected.id) { - const Cc = Components.classes, Ci = Components.interfaces; - let msg = this._bundle.getFormattedString("blocklistChangeRequiresRestart", - [this._brandShortName]); - let title = this._bundle.getFormattedString("shouldRestartTitle", - [this._brandShortName]); - let shouldProceed = Services.prompt.confirm(window, title, msg); - if (shouldProceed) { - let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"] - .createInstance(Ci.nsISupportsPRBool); - Services.obs.notifyObservers(cancelQuit, "quit-application-requested", - "restart"); - shouldProceed = !cancelQuit.data; - - if (shouldProceed) { - let trackingTable = Services.prefs.getCharPref(TRACKING_TABLE_PREF); - if (selected.id != CONTENT_LIST_ID) { - trackingTable = trackingTable.replace("," + CONTENT_LIST_ID + TRACK_SUFFIX, ""); - } else { - trackingTable += "," + CONTENT_LIST_ID + TRACK_SUFFIX; - } - Services.prefs.setCharPref(TRACKING_TABLE_PREF, trackingTable); - Services.prefs.setCharPref(UPDATE_TIME_PREF, 42); - - Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit | - Ci.nsIAppStartup.eRestart); - } - } - - // Don't close the dialog in case we didn't quit. - return; - } - window.close(); - }, - - _loadBlockLists: function () { - this._blockLists = []; - - // Load blocklists into a table. - let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH); - let itemArray = branch.getChildList(""); - for (let itemName of itemArray) { - try { - this._createOrUpdateBlockList(itemName); - } catch (e) { - // Ignore bogus or missing list name. - continue; - } - } - - this._updateTree(); - }, - - _createOrUpdateBlockList: function (itemName) { - let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH); - let key = branch.getCharPref(itemName); - let value = this._bundle.getString(key); - - let suffix = itemName.slice(itemName.lastIndexOf(".")); - let id = itemName.replace(suffix, ""); - let list = this._blockLists.find(el => el.id === id); - if (!list) { - list = { id }; - this._blockLists.push(list); - } - list.selected = this._getActiveList() === id; - - // Get the property name from the suffix (e.g. ".name" -> "name"). - let prop = suffix.slice(1); - list[prop] = value; - - return list; - }, - - _updateTree: function () { - this._tree = document.getElementById("blocklistsTree"); - this._view._rowCount = this._blockLists.length; - this._tree.view = this._view; - }, - - _getActiveList: function () { - let trackingTable = Services.prefs.getCharPref(TRACKING_TABLE_PREF); - return trackingTable.includes(CONTENT_LIST_ID) ? CONTENT_LIST_ID : BASE_LIST_ID; - } -}; - -function initWithParams(params) { - gBlocklistManager.init(params); -} diff --git a/basilisk/components/preferences/blocklists.xul b/basilisk/components/preferences/blocklists.xul deleted file mode 100644 index 523c208..0000000 --- a/basilisk/components/preferences/blocklists.xul +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.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/. --> - -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> - -<!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/blocklists.dtd" > - -<window id="BlocklistsDialog" class="windowDialog" - windowtype="Browser:Blocklists" - title="&window.title;" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - style="width: &window.width;;" - onload="gBlocklistManager.onLoad();" - onunload="gBlocklistManager.uninit();" - persist="screenX screenY width height" - onkeypress="gBlocklistManager.onWindowKeyPress(event);"> - - <script src="chrome://global/content/treeUtils.js"/> - <script src="chrome://browser/content/preferences/blocklists.js"/> - - <stringbundle id="bundlePreferences" - src="chrome://browser/locale/preferences/preferences.properties"/> - - <keyset> - <key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/> - </keyset> - - <vbox class="contentPane largeDialogContainer" flex="1"> - <description id="blocklistsText" control="url"/> - <separator class="thin"/> - <tree id="blocklistsTree" flex="1" style="height: 18em;" - hidecolumnpicker="true" - onselect="gBlocklistManager.onListSelected();"> - <treecols> - <treecol id="selectionCol" label="" flex="1" sortable="false" - type="checkbox"/> - <treecol id="listCol" label="&treehead.list.label;" flex="80" - sortable="false"/> - </treecols> - <treechildren/> - </tree> - </vbox> - <vbox> - <spacer flex="1"/> - <hbox class="actionButtons" align="right" flex="1"> - <button oncommand="close();" icon="close" - label="&button.cancel.label;" accesskey="&button.cancel.accesskey;" /> - <button id="btnApplyChanges" oncommand="gBlocklistManager.onApplyChanges();" icon="save" - label="&button.ok.label;" accesskey="&button.ok.accesskey;"/> - </hbox> - </vbox> -</window> diff --git a/basilisk/components/preferences/donottrack.xul b/basilisk/components/preferences/donottrack.xul deleted file mode 100644 index d0631ac..0000000 --- a/basilisk/components/preferences/donottrack.xul +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.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/. --> - -<?xml-stylesheet href="chrome://global/skin/"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> - -<!DOCTYPE prefwindow [ -<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> -<!ENTITY % doNotTrackDTD SYSTEM "chrome://browser/locale/preferences/donottrack.dtd"> -%brandDTD; -%doNotTrackDTD; -]> - -<prefwindow id="DoNotTrackDialog" type="child" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="&window.title;" - style="width: &window.width;; height: &window.height;;" - dlgbuttons="accept,cancel"> - <prefpane> - <preferences> - <preference id="privacy.donottrackheader.enabled" - name="privacy.donottrackheader.enabled" - type="bool"/> - </preferences> - <hbox align="center" pack="start"> - <!-- Work around focus ring not showing properly. --> - <spacer style="width: 1em;"/> - <checkbox label="&doNotTrackCheckbox2.label;" - accesskey="&doNotTrackCheckbox2.accesskey;" - preference="privacy.donottrackheader.enabled"/> - </hbox> - <description flex="1" class="doNotTrackLearnMore"> - &doNotTrackTPInfo.description; - <label class="text-link" - value="&doNotTrackLearnMore.label;" - href="https://www.mozilla.org/dnt"/> - </description> - </prefpane> -</prefwindow> diff --git a/basilisk/components/preferences/in-content/advanced.js b/basilisk/components/preferences/in-content/advanced.js index 5a94cb3..176dbdd 100644 --- a/basilisk/components/preferences/in-content/advanced.js +++ b/basilisk/components/preferences/in-content/advanced.js @@ -40,10 +40,6 @@ var gAdvancedPane = { this.updateReadPrefs(); } this.updateOfflineApps(); - this.initTelemetry(); - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - this.initSubmitHealthReport(); - } this.updateOnScreenKeyboardVisibility(); this.updateCacheSizeInputField(); this.updateActualCacheSize(); @@ -53,10 +49,6 @@ var gAdvancedPane = { gAdvancedPane.updateHardwareAcceleration); setEventListener("advancedPrefs", "select", gAdvancedPane.tabSelectionChanged); - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - setEventListener("submitHealthReportBox", "command", - gAdvancedPane.updateSubmitHealthReport); - } setEventListener("connectionSettings", "command", gAdvancedPane.showConnections); @@ -107,15 +99,6 @@ var gAdvancedPane = { var advancedPrefs = document.getElementById("advancedPrefs"); var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); - // tabSelectionChanged gets called twice due to the selectedIndex being set - // by both the selectedItem and selectedPanel callstacks. This guard is used - // to prevent double-counting in Telemetry. - if (preference.valueFromPreferences != advancedPrefs.selectedIndex) { - Services.telemetry - .getHistogramById("FX_PREFERENCES_CATEGORY_OPENED") - .add(telemetryBucketForCategory("advanced")); - } - preference.valueFromPreferences = advancedPrefs.selectedIndex; }, @@ -250,63 +233,15 @@ var gAdvancedPane = { }, /** - * The preference/checkbox is configured in XUL. - * - * In all cases, set up the Learn More link sanely. - */ - initTelemetry: function () - { - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore"); - } - }, - - /** - * Set the status of the telemetry controls based on the input argument. - * @param {Boolean} aEnabled False disables the controls, true enables them. - */ - setTelemetrySectionEnabled: function (aEnabled) - { - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - // If FHR is disabled, additional data sharing should be disabled as well. - let disabled = !aEnabled; - document.getElementById("submitTelemetryBox").disabled = disabled; - if (disabled) { - // If we disable FHR, untick the telemetry checkbox. - Services.prefs.setBoolPref("toolkit.telemetry.enabled", false); - } - document.getElementById("telemetryDataDesc").disabled = disabled; - } - }, - - /** * Initialize the health report service reference and checkbox. */ initSubmitHealthReport: function () { - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore"); - - let checkbox = document.getElementById("submitHealthReportBox"); - - if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) { - checkbox.setAttribute("disabled", "true"); - return; - } - - checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED); - this.setTelemetrySectionEnabled(checkbox.checked); - } }, /** * Update the health report preference with state from checkbox. */ updateSubmitHealthReport: function () { - if (AppConstants.MOZ_TELEMETRY_REPORTING) { - let checkbox = document.getElementById("submitHealthReportBox"); - Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked); - this.setTelemetrySectionEnabled(checkbox.checked); - } }, updateOnScreenKeyboardVisibility() { diff --git a/basilisk/components/preferences/in-content/advanced.xul b/basilisk/components/preferences/in-content/advanced.xul index d5498e7..8957211 100644 --- a/basilisk/components/preferences/in-content/advanced.xul +++ b/basilisk/components/preferences/in-content/advanced.xul @@ -47,12 +47,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" @@ -185,42 +179,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"> diff --git a/basilisk/components/preferences/in-content/content.js b/basilisk/components/preferences/in-content/content.js index 2eac10c..80f058a 100644 --- a/basilisk/components/preferences/in-content/content.js +++ b/basilisk/components/preferences/in-content/content.js @@ -117,11 +117,6 @@ var gContentPane = { gSubDialog.open("chrome://browser/content/preferences/permissions.xul", "resizable=yes", params); - - try { - Services.telemetry - .getHistogramById("WEB_NOTIFICATION_EXCEPTIONS_OPENED").add(); - } catch (e) {} }, diff --git a/basilisk/components/preferences/in-content/preferences.js b/basilisk/components/preferences/in-content/preferences.js index 69cb180..f6a6941 100644 --- a/basilisk/components/preferences/in-content/preferences.js +++ b/basilisk/components/preferences/in-content/preferences.js @@ -124,36 +124,6 @@ function init_dynamic_padding() { document.documentElement.appendChild(mediaStyle); } -function telemetryBucketForCategory(category) { - switch (category) { - case "general": - case "search": - case "content": - case "applications": - case "privacy": - case "security": - case "sync": - return category; - case "advanced": - let advancedPaneTabs = document.getElementById("advancedPrefs"); - switch (advancedPaneTabs.selectedTab.id) { - case "generalTab": - return "advancedGeneral"; - case "dataChoicesTab": - return "advancedDataChoices"; - case "networkTab": - return "advancedNetwork"; - case "updateTab": - return "advancedUpdates"; - case "encryptionTab": - return "advancedCerts"; - } - // fall-through for unknown. - default: - return "unknown"; - } -} - function onHashChange() { gotoPref(); } @@ -194,10 +164,6 @@ function gotoPref(aCategory) { search(category, "data-category"); let mainContent = document.querySelector(".main-content"); mainContent.scrollTop = 0; - - Services.telemetry - .getHistogramById("FX_PREFERENCES_CATEGORY_OPENED") - .add(telemetryBucketForCategory(friendlyName)); } function search(aQuery, aAttribute) { diff --git a/basilisk/components/preferences/in-content/privacy.js b/basilisk/components/preferences/in-content/privacy.js index 0774ecc..fe26673 100644 --- a/basilisk/components/preferences/in-content/privacy.js +++ b/basilisk/components/preferences/in-content/privacy.js @@ -20,37 +20,6 @@ var gPrivacyPane = { */ _shouldPromptForRestart: true, -#ifdef MOZ_SAFE_BROWSING - /** - * Show the Tracking Protection UI depending on the - * privacy.trackingprotection.ui.enabled pref, and linkify its Learn More link - */ - _initTrackingProtection: function () { - if (!Services.prefs.getBoolPref("privacy.trackingprotection.ui.enabled")) { - return; - } - - let link = document.getElementById("trackingProtectionLearnMore"); - let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "tracking-protection"; - link.setAttribute("href", url); - - this.trackingProtectionReadPrefs(); - - document.getElementById("trackingprotectionbox").hidden = false; - document.getElementById("trackingprotectionpbmbox").hidden = true; - }, - - /** - * Linkify the Learn More link of the Private Browsing Mode Tracking - * Protection UI. - */ - _initTrackingProtectionPBM: function () { - let link = document.getElementById("trackingProtectionPBMLearnMore"); - let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "tracking-protection-pbm"; - link.setAttribute("href", url); - }, -#endif - /** * Initialize autocomplete to ensure prefs are in sync. */ @@ -76,10 +45,6 @@ var gPrivacyPane = { this.updateHistoryModePane(); this.updatePrivacyMicroControls(); this.initAutoStartPrivateBrowsingReverter(); -#ifdef MOZ_SAFE_BROWSING - this._initTrackingProtection(); - this._initTrackingProtectionPBM(); -#endif this._initAutocomplete(); setEventListener("privacy.sanitize.sanitizeOnShutdown", "change", @@ -104,12 +69,6 @@ var gPrivacyPane = { gPrivacyPane.clearPrivateDataNow(true); return false; }); -#ifdef MOZ_SAFE_BROWSING - setEventListener("doNotTrackSettings", "click", function () { - gPrivacyPane.showDoNotTrackSettings(); - return false; - }); -#endif setEventListener("privateBrowsingAutoStart", "command", gPrivacyPane.updateAutostart); setEventListener("cookieExceptions", "command", @@ -118,64 +77,8 @@ var gPrivacyPane = { gPrivacyPane.showCookies); setEventListener("clearDataSettings", "command", gPrivacyPane.showClearPrivateDataSettings); -#ifdef MOZ_SAFE_BROWSING - setEventListener("trackingProtectionRadioGroup", "command", - gPrivacyPane.trackingProtectionWritePrefs); - setEventListener("trackingProtectionExceptions", "command", - gPrivacyPane.showTrackingProtectionExceptions); - setEventListener("changeBlockList", "command", - gPrivacyPane.showBlockLists); - setEventListener("changeBlockListPBM", "command", - gPrivacyPane.showBlockLists); -#endif }, -#ifdef MOZ_SAFE_BROWSING - // TRACKING PROTECTION MODE - - /** - * Selects the right item of the Tracking Protection radiogroup. - */ - trackingProtectionReadPrefs() { - let enabledPref = document.getElementById("privacy.trackingprotection.enabled"); - let pbmPref = document.getElementById("privacy.trackingprotection.pbmode.enabled"); - let radiogroup = document.getElementById("trackingProtectionRadioGroup"); - - // Global enable takes precedence over enabled in Private Browsing. - if (enabledPref.value) { - radiogroup.value = "always"; - } else if (pbmPref.value) { - radiogroup.value = "private"; - } else { - radiogroup.value = "never"; - } - }, - - /** - * Sets the pref values based on the selected item of the radiogroup. - */ - trackingProtectionWritePrefs() { - let enabledPref = document.getElementById("privacy.trackingprotection.enabled"); - let pbmPref = document.getElementById("privacy.trackingprotection.pbmode.enabled"); - let radiogroup = document.getElementById("trackingProtectionRadioGroup"); - - switch (radiogroup.value) { - case "always": - enabledPref.value = true; - pbmPref.value = true; - break; - case "private": - enabledPref.value = false; - pbmPref.value = true; - break; - case "never": - enabledPref.value = false; - pbmPref.value = false; - break; - } - }, -#endif - // HISTORY MODE /** @@ -412,48 +315,6 @@ var gPrivacyPane = { this._shouldPromptForRestart = true; }, -#ifdef MOZ_SAFE_BROWSING - /** - * Displays fine-grained, per-site preferences for tracking protection. - */ - showTrackingProtectionExceptions() { - let bundlePreferences = document.getElementById("bundlePreferences"); - let params = { - permissionType: "trackingprotection", - hideStatusColumn: true, - windowTitle: bundlePreferences.getString("trackingprotectionpermissionstitle"), - introText: bundlePreferences.getString("trackingprotectionpermissionstext"), - }; - gSubDialog.open("chrome://browser/content/preferences/permissions.xul", - null, params); - }, -#endif - -#ifdef MOZ_SAFE_BROWSING - /** - * Displays the available block lists for tracking protection. - */ - showBlockLists: function () - { - var bundlePreferences = document.getElementById("bundlePreferences"); - let brandName = document.getElementById("bundleBrand") - .getString("brandShortName"); - var params = { brandShortName: brandName, - windowTitle: bundlePreferences.getString("blockliststitle"), - introText: bundlePreferences.getString("blockliststext") }; - gSubDialog.open("chrome://browser/content/preferences/blocklists.xul", - null, params); - }, - - /** - * Displays the Do Not Track settings dialog. - */ - showDoNotTrackSettings() { - gSubDialog.open("chrome://browser/content/preferences/donottrack.xul", - "resizable=no"); - }, -#endif - // HISTORY /* diff --git a/basilisk/components/preferences/in-content/privacy.xul b/basilisk/components/preferences/in-content/privacy.xul index 691cd6b..917e2e6 100644 --- a/basilisk/components/preferences/in-content/privacy.xul +++ b/basilisk/components/preferences/in-content/privacy.xul @@ -10,18 +10,9 @@ <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy"> <!-- Tracking --> -#ifdef MOZ_SAFE_BROWSING - <preference id="privacy.trackingprotection.enabled" - name="privacy.trackingprotection.enabled" - type="bool"/> - <preference id="privacy.trackingprotection.pbmode.enabled" - name="privacy.trackingprotection.pbmode.enabled" - type="bool"/> -#else <preference id="privacy.donottrackheader.enabled" name="privacy.donottrackheader.enabled" type="bool"/> -#endif <!-- XXX button prefs --> <preference id="pref.privacy.disable_button.cookie_exceptions" @@ -91,61 +82,6 @@ <!-- Tracking --> <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true"> -#ifdef MOZ_SAFE_BROWSING - <vbox id="trackingprotectionbox" hidden="true"> - <hbox align="start"> - <vbox> - <caption><label>&trackingProtectionHeader.label; - <label id="trackingProtectionLearnMore" class="text-link" - value="&trackingProtectionLearnMore.label;"/> - </label></caption> - <radiogroup id="trackingProtectionRadioGroup"> - <radio value="always" - label="&trackingProtectionAlways.label;" - accesskey="&trackingProtectionAlways.accesskey;"/> - <radio value="private" - label="&trackingProtectionPrivate.label;" - accesskey="&trackingProtectionPrivate.accesskey;"/> - <radio value="never" - label="&trackingProtectionNever.label;" - accesskey="&trackingProtectionNever.accesskey;"/> - </radiogroup> - </vbox> - <spacer flex="1" /> - <vbox> - <button id="trackingProtectionExceptions" - label="&trackingProtectionExceptions.label;" - accesskey="&trackingProtectionExceptions.accesskey;" - preference="pref.privacy.disable_button.tracking_protection_exceptions"/> - <button id="changeBlockList" - label="&changeBlockList.label;" - accesskey="&changeBlockList.accesskey;" - preference="pref.privacy.disable_button.change_blocklist"/> - </vbox> - </hbox> - </vbox> - <vbox id="trackingprotectionpbmbox"> - <caption><label>&tracking.label;</label></caption> - <hbox align="center"> - <checkbox id="trackingProtectionPBM" - preference="privacy.trackingprotection.pbmode.enabled" - accesskey="&trackingProtectionPBM5.accesskey;" - label="&trackingProtectionPBM5.label;" /> - <label id="trackingProtectionPBMLearnMore" - class="text-link" - value="&trackingProtectionPBMLearnMore.label;"/> - <spacer flex="1" /> - <button id="changeBlockListPBM" - label="&changeBlockList.label;" accesskey="&changeBlockList.accesskey;" - preference="pref.privacy.disable_button.change_blocklist"/> - </hbox> - </vbox> - <vbox> - <description>&doNotTrack.pre.label;<label - class="text-link" id="doNotTrackSettings" - >&doNotTrack.settings.label;</label>&doNotTrack.post.label;</description> - </vbox> -#else <vbox id="donottrackbox"> <caption><label>&tracking.label;</label></caption> <hbox align="center"> @@ -158,7 +94,6 @@ href="https://www.mozilla.org/dnt"/> </hbox> </vbox> -#endif </groupbox> <!-- History --> diff --git a/basilisk/components/preferences/in-content/security.js b/basilisk/components/preferences/in-content/security.js index 37a187f..01cf410 100644 --- a/basilisk/components/preferences/in-content/security.js +++ b/basilisk/components/preferences/in-content/security.js @@ -23,9 +23,6 @@ var gSecurityPane = { this._pane = document.getElementById("paneSecurity"); this._initMasterPasswordUI(); -#ifdef MOZ_SAFE_BROWSING - this._initSafeBrowsing(); -#endif setEventListener("addonExceptions", "command", gSecurityPane.showAddonExceptions); @@ -162,81 +159,6 @@ var gSecurityPane = { checkbox.checked = !noMP; }, -#ifdef MOZ_SAFE_BROWSING - _initSafeBrowsing() { - let enableSafeBrowsing = document.getElementById("enableSafeBrowsing"); - let blockDownloads = document.getElementById("blockDownloads"); - let blockUncommonUnwanted = document.getElementById("blockUncommonUnwanted"); - - let safeBrowsingPhishingPref = document.getElementById("browser.safebrowsing.phishing.enabled"); - let safeBrowsingMalwarePref = document.getElementById("browser.safebrowsing.malware.enabled"); - - let blockDownloadsPref = document.getElementById("browser.safebrowsing.downloads.enabled"); - let malwareTable = document.getElementById("urlclassifier.malwareTable"); - - let blockUnwantedPref = document.getElementById("browser.safebrowsing.downloads.remote.block_potentially_unwanted"); - let blockUncommonPref = document.getElementById("browser.safebrowsing.downloads.remote.block_uncommon"); - - enableSafeBrowsing.addEventListener("command", function() { - safeBrowsingPhishingPref.value = enableSafeBrowsing.checked; - safeBrowsingMalwarePref.value = enableSafeBrowsing.checked; - - if (enableSafeBrowsing.checked) { - blockDownloads.removeAttribute("disabled"); - if (blockDownloads.checked) { - blockUncommonUnwanted.removeAttribute("disabled"); - } - } else { - blockDownloads.setAttribute("disabled", "true"); - blockUncommonUnwanted.setAttribute("disabled", "true"); - } - }); - - blockDownloads.addEventListener("command", function() { - blockDownloadsPref.value = blockDownloads.checked; - if (blockDownloads.checked) { - blockUncommonUnwanted.removeAttribute("disabled"); - } else { - blockUncommonUnwanted.setAttribute("disabled", "true"); - } - }); - - blockUncommonUnwanted.addEventListener("command", function() { - blockUnwantedPref.value = blockUncommonUnwanted.checked; - blockUncommonPref.value = blockUncommonUnwanted.checked; - - let malware = malwareTable.value - .split(",") - .filter(x => x !== "goog-unwanted-shavar" && x !== "test-unwanted-simple"); - - if (blockUncommonUnwanted.checked) { - malware.push("goog-unwanted-shavar"); - malware.push("test-unwanted-simple"); - } - - // sort alphabetically to keep the pref consistent - malware.sort(); - - malwareTable.value = malware.join(","); - }); - - // set initial values - - enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value; - if (!enableSafeBrowsing.checked) { - blockDownloads.setAttribute("disabled", "true"); - blockUncommonUnwanted.setAttribute("disabled", "true"); - } - - blockDownloads.checked = blockDownloadsPref.value; - if (!blockDownloadsPref.value) { - blockUncommonUnwanted.setAttribute("disabled", "true"); - } - - blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value; - }, -#endif - /** * Enables/disables the master password button depending on the state of the * "use master password" checkbox, and prompts for master password removal if diff --git a/basilisk/components/preferences/in-content/security.xul b/basilisk/components/preferences/in-content/security.xul index 33e1471..fca84f7 100644 --- a/basilisk/components/preferences/in-content/security.xul +++ b/basilisk/components/preferences/in-content/security.xul @@ -21,31 +21,6 @@ name="xpinstall.whitelist.required" type="bool"/> -#ifdef MOZ_SAFE_BROWSING - <!-- Malware, phishing --> - <preference id="browser.safebrowsing.malware.enabled" - name="browser.safebrowsing.malware.enabled" - type="bool"/> - <preference id="browser.safebrowsing.phishing.enabled" - name="browser.safebrowsing.phishing.enabled" - type="bool"/> - - <preference id="browser.safebrowsing.downloads.enabled" - name="browser.safebrowsing.downloads.enabled" - type="bool"/> - - <preference id="urlclassifier.malwareTable" - name="urlclassifier.malwareTable" - type="string"/> - - <preference id="browser.safebrowsing.downloads.remote.block_potentially_unwanted" - name="browser.safebrowsing.downloads.remote.block_potentially_unwanted" - type="bool"/> - <preference id="browser.safebrowsing.downloads.remote.block_uncommon" - name="browser.safebrowsing.downloads.remote.block_uncommon" - type="bool"/> -#endif - <!-- Passwords --> <preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/> <preference id="signon.autofillForms" name="signon.autofillForms" type="bool"/> @@ -76,23 +51,6 @@ accesskey="&addonExceptions.accesskey;"/> </hbox> -#ifdef MOZ_SAFE_BROWSING -<!-- Safebrowsing (phishing) UI --> - <separator class="thin"/> - <vbox align="start"> - <checkbox id="enableSafeBrowsing" - label="&enableSafeBrowsing.label;" - accesskey="&enableSafeBrowsing.accesskey;" /> - <vbox class="indent"> - <checkbox id="blockDownloads" - label="&blockDownloads.label;" - accesskey="&blockDownloads.accesskey;" /> - <checkbox id="blockUncommonUnwanted" - label="&blockUncommonUnwanted.label;" - accesskey="&blockUncommonUnwanted.accesskey;" /> - </vbox> - </vbox> -#endif </groupbox> <!-- Passwords --> diff --git a/basilisk/components/preferences/jar.mn b/basilisk/components/preferences/jar.mn index f74be08..50aa0fa 100644 --- a/basilisk/components/preferences/jar.mn +++ b/basilisk/components/preferences/jar.mn @@ -5,18 +5,11 @@ browser.jar: content/browser/preferences/applicationManager.xul content/browser/preferences/applicationManager.js -#ifdef MOZ_SAFE_BROWSING - content/browser/preferences/blocklists.xul - content/browser/preferences/blocklists.js -#endif * content/browser/preferences/colors.xul * content/browser/preferences/cookies.xul content/browser/preferences/cookies.js * content/browser/preferences/connection.xul content/browser/preferences/connection.js -#ifdef MOZ_SAFE_BROWSING - content/browser/preferences/donottrack.xul -#endif * content/browser/preferences/fonts.xul content/browser/preferences/fonts.js content/browser/preferences/handlers.xml diff --git a/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js b/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js index 0018410..28b3398 100644 --- a/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js +++ b/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.js @@ -14,32 +14,6 @@ const FAVICON_PRIVACY = "chrome://browser/skin/privatebrowsing/favicon.svg"; var stringBundle = Services.strings.createBundle( "chrome://browser/locale/aboutPrivateBrowsing.properties"); -#ifdef MOZ_SAFE_BROWSING -var prefBranch = Services.prefs.getBranch("privacy.trackingprotection."); -var prefObserver = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, - Ci.nsISupportsWeakReference]), - observe: function () { - let tpSubHeader = document.getElementById("tpSubHeader"); - let tpToggle = document.getElementById("tpToggle"); - let tpButton = document.getElementById("tpButton"); - let title = document.getElementById("title"); - let titleTracking = document.getElementById("titleTracking"); - let globalTrackingEnabled = prefBranch.getBoolPref("enabled"); - let trackingEnabled = globalTrackingEnabled || - prefBranch.getBoolPref("pbmode.enabled"); - - tpButton.classList.toggle("hide", globalTrackingEnabled); - tpToggle.checked = trackingEnabled; - title.classList.toggle("hide", trackingEnabled); - titleTracking.classList.toggle("hide", !trackingEnabled); - tpSubHeader.classList.toggle("tp-off", !trackingEnabled); - } -}; -prefBranch.addObserver("pbmode.enabled", prefObserver, true); -prefBranch.addObserver("enabled", prefObserver, true); -#endif - function setFavIcon(url) { document.getElementById("favicon").setAttribute("href", url); } @@ -56,29 +30,15 @@ document.addEventListener("DOMContentLoaded", function () { return; } -#ifdef MOZ_SAFE_BROWSING - let tpToggle = document.getElementById("tpToggle"); - document.getElementById("tpButton").addEventListener('click', () => { - tpToggle.click(); - }); -#endif - document.title = stringBundle.GetStringFromName("title.head"); document.getElementById("favicon") .setAttribute("href", FAVICON_PRIVACY); -#ifdef MOZ_SAFE_BROWSING - tpToggle.addEventListener("change", toggleTrackingProtection); -#endif let formatURLPref = Cc["@mozilla.org/toolkit/URLFormatterService;1"] .getService(Ci.nsIURLFormatter).formatURLPref; document.getElementById("learnMore").setAttribute("href", formatURLPref("app.support.baseURL") + "private-browsing"); -#ifdef MOZ_SAFE_BROWSING - // Update state that depends on preferences. - prefObserver.observe(); -#endif }, false); function openPrivateWindow() { @@ -87,11 +47,3 @@ function openPrivateWindow() { new CustomEvent("AboutPrivateBrowsingOpenWindow", {bubbles:true})); } -#ifdef MOZ_SAFE_BROWSING -function toggleTrackingProtection() { - // Ask chrome to enable tracking protection - document.dispatchEvent( - new CustomEvent("AboutPrivateBrowsingToggleTrackingProtection", - {bubbles: true})); -} -#endif diff --git a/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml b/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml index c27de69..9e2f52e 100644 --- a/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml +++ b/basilisk/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml @@ -35,9 +35,6 @@ <div class="showPrivate about-content-container"> <h1 class="title"> <span id="title">&privateBrowsing.title;</span> -#ifdef MOZ_SAFE_BROWSING - <span id="titleTracking">&privateBrowsing.title.tracking;</span> -#endif </h1> <section class="section-main"> <p>&aboutPrivateBrowsing.info.notsaved.before;<strong>&aboutPrivateBrowsing.info.notsaved.emphasize;</strong>&aboutPrivateBrowsing.info.notsaved.after;</p> @@ -63,18 +60,6 @@ </p> </section> -#ifdef MOZ_SAFE_BROWSING - <h2 id="tpSubHeader" class="about-subheader"> - <span class="tpTitle">&trackingProtection.title;</span> - <input id="tpToggle" class="toggle toggle-input" type="checkbox"/> - <span id="tpButton" class="toggle-btn"></span> - </h2> - - <section class="section-main"> - <p>&trackingProtection.description2;</p> - </section> -#endif - <section class="section-main"> <p class="about-info">&aboutPrivateBrowsing.learnMore2; <a id="learnMore" target="_blank">&aboutPrivateBrowsing.learnMore2.title;</a>. diff --git a/basilisk/components/search/content/search.xml b/basilisk/components/search/content/search.xml index 41a5256..1be5c00 100644 --- a/basilisk/components/search/content/search.xml +++ b/basilisk/components/search/content/search.xml @@ -398,8 +398,6 @@ if (!aEngine) { aEngine = this.currentEngine; } - BrowserSearch.recordOneoffSearchInTelemetry(aEngine, source, type, - aWhere); } } @@ -444,7 +442,6 @@ isSuggestion: (!aOneOff && telemetrySearchDetails), selection: telemetrySearchDetails }; - BrowserSearch.recordSearchInTelemetry(engine, "searchbar", details); // null parameter below specifies HTML response for search let params = { postData: submission.postData, @@ -1940,8 +1937,6 @@ aOpenUILinkParams && aOpenUILinkParams.inBackground; let where = tabBackground ? "tab-background" : aOpenUILinkWhere; - BrowserSearch.recordOneoffSearchInTelemetry(engine, source, type, - where); return true; ]]></body> </method> diff --git a/basilisk/components/search/content/searchReset.js b/basilisk/components/search/content/searchReset.js index b541d41..d0e6cfd 100644 --- a/basilisk/components/search/content/searchReset.js +++ b/basilisk/components/search/content/searchReset.js @@ -8,14 +8,6 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components; Cu.import("resource://gre/modules/Services.jsm"); -const TELEMETRY_RESULT_ENUM = { - RESTORED_DEFAULT: 0, - KEPT_CURRENT: 1, - CHANGED_ENGINE: 2, - CLOSED_PAGE: 3, - OPENED_SETTINGS: 4 -}; - window.onload = function() { let defaultEngine = document.getElementById("defaultEngine"); let originalDefault = Services.search.originalDefaultEngine; @@ -24,7 +16,6 @@ window.onload = function() { 'url("' + originalDefault.iconURI.spec + '")'; document.getElementById("searchResetChangeEngine").focus(); - window.addEventListener("unload", recordPageClosed); document.getElementById("linkSettingsPage") .addEventListener("click", openingSettings); }; @@ -46,8 +37,6 @@ function doSearch() { let engine = Services.search.currentEngine; let submission = engine.getSubmission(queryString, null, purpose); - window.removeEventListener("unload", recordPageClosed); - let win = window.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIWebNavigation) .QueryInterface(Ci.nsIDocShellTreeItem) @@ -58,19 +47,12 @@ function doSearch() { } function openingSettings() { - record(TELEMETRY_RESULT_ENUM.OPENED_SETTINGS); - window.removeEventListener("unload", recordPageClosed); -} - -function record(result) { - Services.telemetry.getHistogramById("SEARCH_RESET_RESULT").add(result); } function keepCurrentEngine() { // Calling the currentEngine setter will force a correct loadPathHash to be // written for this engine, so that we don't prompt the user again. Services.search.currentEngine = Services.search.currentEngine; - record(TELEMETRY_RESULT_ENUM.KEPT_CURRENT); doSearch(); } @@ -80,11 +62,6 @@ function changeSearchEngine() { engine.hidden = false; Services.search.currentEngine = engine; - record(TELEMETRY_RESULT_ENUM.RESTORED_DEFAULT); - doSearch(); } -function recordPageClosed() { - record(TELEMETRY_RESULT_ENUM.CLOSED_PAGE); -} diff --git a/basilisk/components/search/service/nsSearchService.js b/basilisk/components/search/service/nsSearchService.js index 3cd2531..403d06c 100644 --- a/basilisk/components/search/service/nsSearchService.js +++ b/basilisk/components/search/service/nsSearchService.js @@ -2313,8 +2313,6 @@ SearchService.prototype = { this._initObservers.resolve(this._initRV); Services.obs.notifyObservers(null, SEARCH_SERVICE_TOPIC, "init-complete"); - Services.telemetry.getHistogramById("SEARCH_SERVICE_INIT_SYNC").add(true); - this._recordEngineTelemetry(); LOG("_syncInit end"); }, @@ -2352,8 +2350,6 @@ SearchService.prototype = { this._cacheFileJSON = null; this._initObservers.resolve(this._initRV); Services.obs.notifyObservers(null, SEARCH_SERVICE_TOPIC, "init-complete"); - Services.telemetry.getHistogramById("SEARCH_SERVICE_INIT_SYNC").add(false); - this._recordEngineTelemetry(); LOG("_asyncInit: Completed _asyncInit"); }), @@ -2719,7 +2715,6 @@ SearchService.prototype = { // Typically we'll re-init as a result of a pref observer, // so signal to 'callers' that we're done. Services.obs.notifyObservers(null, SEARCH_SERVICE_TOPIC, "init-complete"); - this._recordEngineTelemetry(); gInitialized = true; } catch (err) { LOG("Reinit failed: " + err); @@ -3896,25 +3891,6 @@ SearchService.prototype = { return result; }, - _recordEngineTelemetry: function() { - Services.telemetry.getHistogramById("SEARCH_SERVICE_ENGINE_COUNT") - .add(Object.keys(this._engines).length); - let hasUpdates = false; - let hasIconUpdates = false; - for (let name in this._engines) { - let engine = this._engines[name]; - if (engine._hasUpdates) { - hasUpdates = true; - if (engine._iconUpdateURL) { - hasIconUpdates = true; - break; - } - } - } - Services.telemetry.getHistogramById("SEARCH_SERVICE_HAS_UPDATES").add(hasUpdates); - Services.telemetry.getHistogramById("SEARCH_SERVICE_HAS_ICON_UPDATES").add(hasIconUpdates); - }, - /** * This map is built lazily after the available search engines change. It * allows quick parsing of an URL representing a search submission into the diff --git a/basilisk/components/selfsupport/SelfSupportService.js b/basilisk/components/selfsupport/SelfSupportService.js index 26148c6..103b065 100644 --- a/basilisk/components/selfsupport/SelfSupportService.js +++ b/basilisk/components/selfsupport/SelfSupportService.js @@ -12,13 +12,6 @@ Cu.import("resource://gre/modules/Preferences.jsm"); const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled"; -XPCOMUtils.defineLazyModuleGetter(this, "TelemetryArchive", - "resource://gre/modules/TelemetryArchive.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "TelemetryEnvironment", - "resource://gre/modules/TelemetryEnvironment.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "TelemetryController", - "resource://gre/modules/TelemetryController.jsm"); - function MozSelfSupportInterface() { } @@ -51,24 +44,6 @@ MozSelfSupportInterface.prototype = { Services.search.resetToOriginalDefaultEngine(); }, - getTelemetryPingList: function() { - return this._wrapPromise(TelemetryArchive.promiseArchivedPingList()); - }, - - getTelemetryPing: function(pingId) { - return this._wrapPromise(TelemetryArchive.promiseArchivedPingById(pingId)); - }, - - getCurrentTelemetryEnvironment: function() { - const current = TelemetryEnvironment.currentEnvironment; - return new this._window.Promise(resolve => resolve(current)); - }, - - getCurrentTelemetrySubsessionPing: function() { - const current = TelemetryController.getCurrentPingData(true); - return new this._window.Promise(resolve => resolve(current)); - }, - _wrapPromise: function(promise) { return new this._window.Promise( (resolve, reject) => promise.then(resolve, reject)); diff --git a/basilisk/components/sessionstore/SessionFile.jsm b/basilisk/components/sessionstore/SessionFile.jsm index 3c55101..a51b03d 100644 --- a/basilisk/components/sessionstore/SessionFile.jsm +++ b/basilisk/components/sessionstore/SessionFile.jsm @@ -45,8 +45,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "RunState", "resource:///modules/sessionstore/RunState.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); -XPCOMUtils.defineLazyServiceGetter(this, "Telemetry", - "@mozilla.org/base/telemetry;1", "nsITelemetry"); XPCOMUtils.defineLazyServiceGetter(this, "sessionStartup", "@mozilla.org/browser/sessionstartup;1", "nsISessionStartup"); XPCOMUtils.defineLazyModuleGetter(this, "SessionWorker", @@ -234,10 +232,6 @@ var SessionFileInternal = { source: source, parsed: parsed }; - Telemetry.getHistogramById("FX_SESSION_RESTORE_CORRUPT_FILE"). - add(false); - Telemetry.getHistogramById("FX_SESSION_RESTORE_READ_FILE_MS"). - add(Date.now() - startMs); break; } catch (ex if ex instanceof OS.File.Error && ex.becauseNoSuchFile) { exists = false; @@ -253,16 +247,12 @@ var SessionFileInternal = { } finally { if (exists) { noFilesFound = false; - Telemetry.getHistogramById("FX_SESSION_RESTORE_CORRUPT_FILE"). - add(corrupted); } } } // All files are corrupted if files found but none could deliver a result. let allCorrupt = !noFilesFound && !result; - Telemetry.getHistogramById("FX_SESSION_RESTORE_ALL_FILES_CORRUPT"). - add(allCorrupt); if (!result) { // If everything fails, start with an empty session. @@ -331,7 +321,6 @@ var SessionFileInternal = { // Wait until the write is done. promise = promise.then(msg => { // Record how long the write took. - this._recordTelemetry(msg.telemetry); this._successes++; if (msg.result.upgradeBackup) { // We have just completed a backup-on-upgrade, store the information @@ -379,19 +368,4 @@ var SessionFileInternal = { return this._postToWorker("wipe"); }, - _recordTelemetry: function(telemetry) { - for (let id of Object.keys(telemetry)){ - let value = telemetry[id]; - let samples = []; - if (Array.isArray(value)) { - samples.push(...value); - } else { - samples.push(value); - } - let histogram = Telemetry.getHistogramById(id); - for (let sample of samples) { - histogram.add(sample); - } - } - } }; diff --git a/basilisk/components/sessionstore/SessionStore.jsm b/basilisk/components/sessionstore/SessionStore.jsm index 144fa46..9d9ef55 100644 --- a/basilisk/components/sessionstore/SessionStore.jsm +++ b/basilisk/components/sessionstore/SessionStore.jsm @@ -135,7 +135,6 @@ Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm", this); Cu.import("resource://gre/modules/Promise.jsm", this); Cu.import("resource://gre/modules/Services.jsm", this); Cu.import("resource://gre/modules/Task.jsm", this); -Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", this); Cu.import("resource://gre/modules/Timer.jsm", this); Cu.import("resource://gre/modules/XPCOMUtils.jsm", this); Cu.import("resource://gre/modules/debug.js", this); @@ -145,8 +144,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gSessionStartup", "@mozilla.org/browser/sessionstartup;1", "nsISessionStartup"); XPCOMUtils.defineLazyServiceGetter(this, "gScreenManager", "@mozilla.org/gfx/screenmanager;1", "nsIScreenManager"); -XPCOMUtils.defineLazyServiceGetter(this, "Telemetry", - "@mozilla.org/base/telemetry;1", "nsITelemetry"); XPCOMUtils.defineLazyModuleGetter(this, "console", "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow", @@ -550,7 +547,6 @@ var SessionStoreInternal = { throw new Error("SessionStore.init() must only be called once!"); } - TelemetryTimestamps.add("sessionRestoreInitialized"); OBSERVING.forEach(function(aTopic) { Services.obs.addObserver(this, aTopic, true); }, this); @@ -782,9 +778,8 @@ var SessionStoreInternal = { return; } - // Record telemetry measurements done in the child and update the tab's - // cached state. Mark the window as dirty and trigger a delayed write. - this.recordTelemetry(aMessage.data.telemetry); + // Update the tab's cached state. + // Mark the window as dirty and trigger a delayed write. TabState.update(browser, aMessage.data); this.saveStateDelayed(win); @@ -919,18 +914,6 @@ var SessionStoreInternal = { } }, - /** - * Record telemetry measurements stored in an object. - * @param telemetry - * {histogramID: value, ...} An object mapping histogramIDs to the - * value to be recorded for that ID, - */ - recordTelemetry: function (telemetry) { - for (let histogramId in telemetry){ - Telemetry.getHistogramById(histogramId).add(telemetry[histogramId]); - } - }, - /* ........ Window Event Handlers .............. */ /** @@ -1081,7 +1064,6 @@ var SessionStoreInternal = { // Nothing to restore now, notify observers things are complete. Services.obs.notifyObservers(null, NOTIFY_WINDOWS_RESTORED, ""); } else { - TelemetryTimestamps.add("sessionRestoreRestoring"); this._restoreCount = aInitialState.windows ? aInitialState.windows.length : 0; // global data must be restored before restoreWindow is called so that @@ -3810,8 +3792,7 @@ var SessionStoreInternal = { }, /** - * Update the session start time and send a telemetry measurement - * for the number of days elapsed since the session was started. + * Update the session start time. * * @param state * The session state. @@ -4437,13 +4418,7 @@ var SessionStoreInternal = { * Handle an error report from a content process. */ reportInternalError(data) { - // For the moment, we only report errors through Telemetry. - if (data.telemetry) { - for (let key of Object.keys(data.telemetry)) { - let histogram = Telemetry.getHistogramById(key); - histogram.add(data.telemetry[key]); - } - } + // STUB, was only reported through Telemetry. }, /** diff --git a/basilisk/components/sessionstore/SessionWorker.js b/basilisk/components/sessionstore/SessionWorker.js index 7d802a7..1297a11 100644 --- a/basilisk/components/sessionstore/SessionWorker.js +++ b/basilisk/components/sessionstore/SessionWorker.js @@ -126,7 +126,6 @@ var Agent = { */ write: function (state, options = {}) { let exn; - let telemetry = {}; // Cap the number of backward and forward shistory entries on shutdown. if (options.isFinalWrite) { @@ -197,9 +196,6 @@ var Agent = { }); } - telemetry.FX_SESSION_RESTORE_WRITE_FILE_MS = Date.now() - startWriteMs; - telemetry.FX_SESSION_RESTORE_FILE_SIZE_BYTES = data.byteLength; - } catch (ex) { // Don't throw immediately exn = exn || ex; @@ -276,7 +272,6 @@ var Agent = { result: { upgradeBackup: upgradeBackupComplete }, - telemetry: telemetry, }; }, diff --git a/basilisk/components/sessionstore/StartupPerformance.jsm b/basilisk/components/sessionstore/StartupPerformance.jsm index d1b77a2..361602b 100644 --- a/basilisk/components/sessionstore/StartupPerformance.jsm +++ b/basilisk/components/sessionstore/StartupPerformance.jsm @@ -111,18 +111,6 @@ this.StartupPerformance = { return; } - // Once we are done restoring tabs, update Telemetry. - let histogramName = isAutoRestore ? - "FX_SESSION_RESTORE_AUTO_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS" : - "FX_SESSION_RESTORE_MANUAL_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS"; - let histogram = Services.telemetry.getHistogramById(histogramName); - let delta = this._latestRestoredTimeStamp - this._startTimeStamp; - histogram.add(delta); - - Services.telemetry.getHistogramById("FX_SESSION_RESTORE_NUMBER_OF_EAGER_TABS_RESTORED").add(this._totalNumberOfEagerTabs); - Services.telemetry.getHistogramById("FX_SESSION_RESTORE_NUMBER_OF_TABS_RESTORED").add(this._totalNumberOfTabs); - Services.telemetry.getHistogramById("FX_SESSION_RESTORE_NUMBER_OF_WINDOWS_RESTORED").add(this._totalNumberOfWindows); - // Reset this._startTimeStamp = null; } catch (ex) { diff --git a/basilisk/components/sessionstore/content/content-sessionStore.js b/basilisk/components/sessionstore/content/content-sessionStore.js index 858e357..8af3350 100644 --- a/basilisk/components/sessionstore/content/content-sessionStore.js +++ b/basilisk/components/sessionstore/content/content-sessionStore.js @@ -628,7 +628,6 @@ var SessionStorageListener = { let size = this.estimateStorageSize(collected); - MessageQueue.push("telemetry", () => ({ FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS: size })); if (size > Preferences.get("browser.sessionstore.dom_storage_limit", DOM_STORAGE_MAX_CHARS)) { // Rather than keeping the old storage, which wouldn't match the rest // of the state of the page, empty the storage. DOM storage will be @@ -800,37 +799,23 @@ var MessageQueue = { let durationMs = Date.now(); let data = {}; - let telemetry = {}; for (let [key, func] of this._data) { let value = func(); - if (key == "telemetry") { - for (let histogramId of Object.keys(value)) { - telemetry[histogramId] = value[histogramId]; - } - } else if (value || (key != "storagechange" && key != "historychange")) { + if (value || (key != "storagechange" && key != "historychange")) { data[key] = value; } } this._data.clear(); - durationMs = Date.now() - durationMs; - telemetry.FX_SESSION_RESTORE_CONTENT_COLLECT_DATA_LONGEST_OP_MS = durationMs; - try { // Send all data to the parent process. sendAsyncMessage("SessionStore:update", { - data, telemetry, flushID, + data, flushID, isFinal: options.isFinal || false, epoch: gCurrentEpoch }); } catch (ex if ex && ex.result == Cr.NS_ERROR_OUT_OF_MEMORY) { - let telemetry = { - FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM: 1 - }; - sendAsyncMessage("SessionStore:error", { - telemetry - }); } }, }; diff --git a/basilisk/components/sessionstore/nsSessionStartup.js b/basilisk/components/sessionstore/nsSessionStartup.js index 9e77b12..0dba95c 100644 --- a/basilisk/components/sessionstore/nsSessionStartup.js +++ b/basilisk/components/sessionstore/nsSessionStartup.js @@ -203,11 +203,6 @@ SessionStartup.prototype = { } } - // Report shutdown success via telemetry. Shortcoming here are - // being-killed-by-OS-shutdown-logic, shutdown freezing after - // session restore was written, etc. - Services.telemetry.getHistogramById("SHUTDOWN_OK").add(!this._previousSessionCrashed); - // set the startup type if (this._previousSessionCrashed && resumeFromCrash) this._sessionType = Ci.nsISessionStartup.RECOVER_SESSION; diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh index a235278..e3b448e 100644 --- a/basilisk/confvars.sh +++ b/basilisk/confvars.sh @@ -4,13 +4,18 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOZ_APP_BASENAME=Basilisk -MOZ_APP_VENDOR=Moonchild +MOZ_APP_VENDOR=Basilisk-Dev MOZ_PHOENIX=1 MOZ_AUSTRALIS=1 MC_BASILISK=1 MOZ_UPDATER= MOZ_BUNDLED_FONTS=1 +if test "$OS_ARCH" = "WINNT" -o \ + "$OS_ARCH" = "Linux"; then + MOZ_BUNDLED_FONTS=1 +fi + # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release # builds so add-on developers have something to target while maintaining # Firefox compatiblity. @@ -51,11 +56,9 @@ MOZ_DEVTOOLS=1 MOZ_SERVICES_COMMON=1 MOZ_SERVICES_SYNC=1 MOZ_SERVICES_HEALTHREPORT= -MOZ_SAFE_BROWSING= MOZ_GAMEPAD=1 MOZ_AV1=1 MOZ_SECURITY_SQLSTORE=1 -NSS_DISABLE_DBM=1 if test "$OS_ARCH" = "WINNT" -o \ "$OS_ARCH" = "Darwin"; then diff --git a/basilisk/installer/Makefile.in b/basilisk/installer/Makefile.in index dd16ecd..db84bed 100644 --- a/basilisk/installer/Makefile.in +++ b/basilisk/installer/Makefile.in @@ -15,12 +15,6 @@ MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn # Some files have been already bundled with xulrunner MOZ_PKG_FATAL_WARNINGS = 1 -# When packaging an artifact build not all xpt files expected by the -# packager will be present. -ifdef MOZ_ARTIFACT_BUILDS -MOZ_PKG_FATAL_WARNINGS = -endif - DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR) ifdef MOZ_DEBUG @@ -42,14 +36,6 @@ ifdef MOZ_SYSTEM_NSS DEFINES += -DMOZ_SYSTEM_NSS=1 endif -ifdef NSS_DISABLE_DBM -DEFINES += -DNSS_DISABLE_DBM=1 -endif - -ifdef MOZ_ARTIFACT_BUILDS -DEFINES += -DMOZ_ARTIFACT_BUILDS=1 -endif - DEFINES += -DJAREXT= ifdef MOZ_ANGLE_RENDERER @@ -149,14 +135,8 @@ endif endif -# Builds using the hybrid FasterMake/RecursiveMake backend will -# fail to produce a langpack. See bug 1255096. make-langpack: -ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) $(MAKE) -C $(DEPTH)/basilisk/locales langpack -else - @echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2 -endif libs:: make-langpack diff --git a/basilisk/installer/allowed-dupes.mn b/basilisk/installer/allowed-dupes.mn index a3780bf..9469554 100644 --- a/basilisk/installer/allowed-dupes.mn +++ b/basilisk/installer/allowed-dupes.mn @@ -124,8 +124,6 @@ chrome/en-US/locale/en-US/browser/overrides/dom/dom.properties chrome/en-US/locale/en-US/browser/overrides/global.dtd chrome/en-US/locale/en-US/browser/overrides/global/aboutSupport.dtd chrome/en-US/locale/en-US/browser/overrides/global/aboutSupport.properties -chrome/en-US/locale/en-US/browser/overrides/global/aboutTelemetry.dtd -chrome/en-US/locale/en-US/browser/overrides/global/aboutTelemetry.properties chrome/en-US/locale/en-US/browser/overrides/global/aboutWebrtc.properties chrome/en-US/locale/en-US/browser/overrides/global/mozilla.dtd chrome/en-US/locale/en-US/browser/overrides/intl.css @@ -148,8 +146,6 @@ chrome/en-US/locale/en-US/global/aboutReader.properties chrome/en-US/locale/en-US/global/aboutRights.dtd chrome/en-US/locale/en-US/global/aboutSupport.dtd chrome/en-US/locale/en-US/global/aboutSupport.properties -chrome/en-US/locale/en-US/global/aboutTelemetry.dtd -chrome/en-US/locale/en-US/global/aboutTelemetry.properties chrome/en-US/locale/en-US/global/aboutWebrtc.properties chrome/en-US/locale/en-US/global/charsetMenu.properties chrome/en-US/locale/en-US/global/commonDialogs.properties diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 1fb928b..1c7be13 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -50,7 +50,9 @@ @RESPATH@/chrome/@AB_CD@@JAREXT@ @RESPATH@/chrome/@AB_CD@.manifest @RESPATH@/dictionaries/* +#if defined(XP_WIN) || defined(XP_LINUX) @RESPATH@/fonts/* +#endif @RESPATH@/hyphenation/* @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js #ifdef HAVE_MAKENSISU @@ -140,12 +142,6 @@ #endif ; [Components] -#ifdef MOZ_ARTIFACT_BUILDS -@RESPATH@/components/prebuilt-interfaces.manifest -@RESPATH@/components/interfaces.xpt -@RESPATH@/browser/components/prebuilt-interfaces.manifest -@RESPATH@/browser/components/interfaces.xpt -#endif @RESPATH@/browser/components/components.manifest @RESPATH@/components/alerts.xpt #ifdef ACCESSIBILITY @@ -319,7 +315,6 @@ @RESPATH@/components/xul.xpt @RESPATH@/components/xultmpl.xpt @RESPATH@/components/zipwriter.xpt -@RESPATH@/components/telemetry.xpt ; JavaScript components @RESPATH@/components/ConsoleAPI.manifest @@ -425,8 +420,6 @@ @RESPATH@/components/PlacesCategoriesStarter.js @RESPATH@/components/ColorAnalyzer.js @RESPATH@/components/PageThumbsProtocol.js -@RESPATH@/components/mozProtocolHandler.js -@RESPATH@/components/mozProtocolHandler.manifest @RESPATH@/components/nsDefaultCLH.manifest @RESPATH@/components/nsDefaultCLH.js @RESPATH@/components/nsContentPrefService.manifest @@ -477,8 +470,6 @@ @RESPATH@/components/captivedetect.js @RESPATH@/components/servicesComponents.manifest @RESPATH@/components/cryptoComponents.manifest -@RESPATH@/components/TelemetryStartup.js -@RESPATH@/components/TelemetryStartup.manifest @RESPATH@/components/XULStore.js @RESPATH@/components/XULStore.manifest @RESPATH@/components/messageWakeupService.js @@ -487,8 +478,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 @@ -511,11 +500,6 @@ @RESPATH@/components/PeerConnection.manifest #endif -@RESPATH@/chrome/marionette@JAREXT@ -@RESPATH@/chrome/marionette.manifest -@RESPATH@/components/marionette.manifest -@RESPATH@/components/marionette.js - #ifdef MOZ_WEBSPEECH @RESPATH@/components/dom_webspeechsynth.xpt #endif @@ -537,19 +521,9 @@ @RESPATH@/browser/modules/* @RESPATH@/modules/* -#ifdef MOZ_URL_CLASSIFIER -; Safe Browsing -@RESPATH@/components/nsURLClassifier.manifest -@RESPATH@/components/nsUrlClassifierHashCompleter.js -@RESPATH@/components/nsUrlClassifierListManager.js -@RESPATH@/components/nsUrlClassifierLib.js -@RESPATH@/components/url-classifier.xpt -#endif - ; Private Browsing @RESPATH@/components/privatebrowsing.xpt @RESPATH@/components/PrivateBrowsing.manifest -@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js ; ANGLE GLES-on-D3D rendering library #ifdef MOZ_ANGLE_RENDERER @@ -572,8 +546,6 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @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 @@ -683,9 +655,6 @@ #endif @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ -#ifndef NSS_DISABLE_DBM -@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ -#endif #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ @@ -711,7 +680,6 @@ @RESPATH@/components/dom_audiochannel.xpt ; Shutdown Terminator -@RESPATH@/components/nsTerminatorTelemetry.js @RESPATH@/components/terminator.manifest #if defined(CLANG_CXX) diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in index d031911..f8dab66 100644 --- a/basilisk/installer/windows/nsis/defines.nsi.in +++ b/basilisk/installer/windows/nsis/defines.nsi.in @@ -51,7 +51,7 @@ VIProductVersion "1.0.0.0" VIAddVersionKey "ProductName" "${BrandShortName}" VIAddVersionKey "CompanyName" "${CompanyName}" #ifdef MOZ_OFFICIAL_BRANDING -VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions." +VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of the Basilisk Development Team." #endif VIAddVersionKey "LegalCopyright" "${CompanyName}" VIAddVersionKey "FileVersion" "${AppVersion}" diff --git a/basilisk/installer/windows/nsis/shared.nsh b/basilisk/installer/windows/nsis/shared.nsh index fbcac74..1996fb9 100644 --- a/basilisk/installer/windows/nsis/shared.nsh +++ b/basilisk/installer/windows/nsis/shared.nsh @@ -533,7 +533,7 @@ ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0 ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0 ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0 - ${WriteRegStr2} $1 "$0" "Publisher" "Moonchild Productions" 0 + ${WriteRegStr2} $1 "$0" "Publisher" "Basilisk Development Team" 0 ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0 DeleteRegValue SHCTX "$0" "URLInfoAbout" ; Don't add URLUpdateInfo which is the release notes url except for the release diff --git a/basilisk/locales/en-US/chrome/browser/aboutDialog.dtd b/basilisk/locales/en-US/chrome/browser/aboutDialog.dtd index e0c3469..1f87b60 100644 --- a/basilisk/locales/en-US/chrome/browser/aboutDialog.dtd +++ b/basilisk/locales/en-US/chrome/browser/aboutDialog.dtd @@ -16,8 +16,6 @@ <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. --> <!ENTITY warningDesc.version "&brandShortName; is experimental and may be unstable."> -<!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. --> -<!ENTITY warningDesc.telemetryDesc "It automatically sends information about performance, hardware, usage and customizations back to &vendorShortName; to help make &brandShortName; better."> <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. --> <!ENTITY community.exp.start ""> diff --git a/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd b/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd index ccb0d29..bcf9189 100644 --- a/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd +++ b/basilisk/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd @@ -25,7 +25,3 @@ <!ENTITY aboutPrivateBrowsing.note.after " on the Internet. Your employer or Internet service provider can still know what page you visit."> <!ENTITY aboutPrivateBrowsing.learnMore2 "Learn more about"> <!ENTITY aboutPrivateBrowsing.learnMore2.title "Private Browsing"> - -<!ENTITY trackingProtection.title "Tracking Protection"> -<!ENTITY trackingProtection.description2 "Some websites use trackers that can monitor your activity across the Internet. With Tracking Protection &brandShortName; will block many trackers that can collect information about your browsing behavior."> -<!ENTITY trackingProtection.startTour1 "See how it works"> diff --git a/basilisk/locales/en-US/chrome/browser/browser.dtd b/basilisk/locales/en-US/chrome/browser/browser.dtd index 044fd30..e651760 100644 --- a/basilisk/locales/en-US/chrome/browser/browser.dtd +++ b/basilisk/locales/en-US/chrome/browser/browser.dtd @@ -726,33 +726,6 @@ you can use these alternative items. Otherwise, their values should be empty. - <!ENTITY getUserMedia.audioCapture.label "Audio from the tab will be shared."> <!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared."> -<!ENTITY trackingProtection.title "Tracking Protection"> -<!ENTITY trackingProtection.detectedBlocked3 "&brandShortName; is blocking parts of the page that may track your browsing."> -<!ENTITY trackingProtection.detectedNotBlocked3 "This site includes elements that may track your browsing. You have disabled protection."> -<!ENTITY trackingProtection.notDetected3 "No tracking elements detected on this page."> -<!-- LOCALIZATION NOTE (trackingProtection.unblock.label, trackingProtection.unblock.accesskey): - The associated button with this label and accesskey is only shown when opening the control - center while looking at a site with trackers in NON-private browsing mode. --> -<!ENTITY trackingProtection.unblock.label "Disable protection for this site"> -<!ENTITY trackingProtection.unblock.accesskey "D"> -<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate.label, trackingProtection.unblockPrivate.accesskey): - The associated button with this label and accesskey is only shown when opening the control - center while looking at a site with trackers in PRIVATE browsing mode. --> -<!ENTITY trackingProtection.unblockPrivate.label "Disable protection for this session"> -<!ENTITY trackingProtection.unblockPrivate.accesskey "D"> -<!ENTITY trackingProtection.block2.label "Enable protection"> -<!ENTITY trackingProtection.block2.accesskey "E"> - -<!ENTITY trackingContentBlocked.message "Tracking"> -<!ENTITY trackingContentBlocked.moreinfo "Parts of the page that track your online activity have been blocked."> -<!ENTITY trackingContentBlocked.learnMore "Learn More"> -<!ENTITY trackingContentBlocked.options "Options"> -<!ENTITY trackingContentBlocked.unblock2.label "Disable protection for this site"> -<!ENTITY trackingContentBlocked.unblock2.accesskey "D"> -<!ENTITY trackingContentBlocked.block.label "Enable protection"> -<!ENTITY trackingContentBlocked.block.accesskey "E"> -<!ENTITY trackingContentBlocked.disabled.message "Tracking protection is disabled"> - <!ENTITY pluginNotification.showAll.label "Show All"> <!ENTITY pluginNotification.showAll.accesskey "S"> diff --git a/basilisk/locales/en-US/chrome/browser/browser.properties b/basilisk/locales/en-US/chrome/browser/browser.properties index abec30b..c9a05af 100644 --- a/basilisk/locales/en-US/chrome/browser/browser.properties +++ b/basilisk/locales/en-US/chrome/browser/browser.properties @@ -336,9 +336,6 @@ identity.identified.state_and_country=%S, %S identity.icon.tooltip=Show site information -trackingProtection.icon.activeTooltip=Tracking attempts blocked -trackingProtection.icon.disabledTooltip=Tracking content detected - # Edit Bookmark UI editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you. @@ -427,11 +424,6 @@ safeModeRestartButton=Restart # menu, set this to "true". Otherwise, you can leave it as "false". browser.menu.showCharacterEncoding=false -# Mozilla data reporting notification (Telemetry, Firefox Health Report, etc) -dataReportingNotification.message = %1$S automatically sends some data to %2$S so that we can improve your experience. -dataReportingNotification.button.label = Choose What I Share -dataReportingNotification.button.accessKey = C - # Process hang reporter processHang.label = A web page is slowing down your browser. What would you like to do? processHang.button_stop.label = Stop It diff --git a/basilisk/locales/en-US/chrome/browser/preferences/advanced.dtd b/basilisk/locales/en-US/chrome/browser/preferences/advanced.dtd index 124c00d..25429c6 100644 --- a/basilisk/locales/en-US/chrome/browser/preferences/advanced.dtd +++ b/basilisk/locales/en-US/chrome/browser/preferences/advanced.dtd @@ -35,11 +35,6 @@ <!ENTITY enableHealthReport.accesskey "R"> <!ENTITY healthReportLearnMore.label "Learn More"> -<!ENTITY telemetryDesc.label "Shares performance, usage, hardware and customization data about your browser with &vendorShortName; to help us make &brandShortName; better"> -<!ENTITY enableTelemetryData.label "Share additional data (i.e., Telemetry)"> -<!ENTITY enableTelemetryData.accesskey "T"> -<!ENTITY telemetryLearnMore.label "Learn More"> - <!ENTITY crashReporterDesc2.label "Crash reports help &vendorShortName; fix problems and make your browser more stable and secure"> <!ENTITY alwaysSubmitCrashReports.label "Allow &brandShortName; to send backlogged crash reports on your behalf"> <!ENTITY alwaysSubmitCrashReports.accesskey "c"> diff --git a/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd b/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd deleted file mode 100644 index 781fb53..0000000 --- a/basilisk/locales/en-US/chrome/browser/preferences/donottrack.dtd +++ /dev/null @@ -1,13 +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/. --> - -<!ENTITY window.title "Do Not Track"> -<!ENTITY window.width "50em"> -<!ENTITY window.height "10em"> - -<!ENTITY doNotTrackCheckbox2.label "Always apply Do Not Track"> -<!ENTITY doNotTrackCheckbox2.accesskey "A"> - -<!ENTITY doNotTrackTPInfo.description "&brandShortName; will send a signal that you don’t want to be tracked whenever Tracking Protection is on."> -<!ENTITY doNotTrackLearnMore.label "Learn More"> diff --git a/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties b/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties index c0b7e1b..8ebb867 100644 --- a/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties @@ -19,8 +19,6 @@ acceptVeryLargeMinimumFont=Keep my changes anyway #### Permissions Manager -trackingprotectionpermissionstext=You have disabled Tracking Protection on these sites. -trackingprotectionpermissionstitle=Exceptions - Tracking Protection cookiepermissionstext=You can specify which websites are always or never allowed to store cookies and site data. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow. cookiepermissionstitle=Exceptions - Cookies and Site Data addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow. diff --git a/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd b/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd index 8820e92..e9f3984 100644 --- a/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -3,34 +3,9 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY tracking.label "Tracking"> -#ifdef MOZ_SAFE_BROWSING -<!ENTITY trackingProtectionHeader.label "Use Tracking Protection"> -<!ENTITY trackingProtectionAlways.label "Always"> -<!ENTITY trackingProtectionAlways.accesskey "y"> -<!ENTITY trackingProtectionPrivate.label "Only in private windows"> -<!ENTITY trackingProtectionPrivate.accesskey "l"> -<!ENTITY trackingProtectionNever.label "Never"> -<!ENTITY trackingProtectionNever.accesskey "n"> -<!ENTITY trackingProtectionLearnMore.label "Learn more"> -<!ENTITY trackingProtectionExceptions.label "Exceptions…"> -<!ENTITY trackingProtectionExceptions.accesskey "x"> - -<!ENTITY trackingProtectionPBM5.label "Use Tracking Protection in Private Windows"> -<!ENTITY trackingProtectionPBM5.accesskey "v"> -<!ENTITY trackingProtectionPBMLearnMore.label "Learn more"> -<!ENTITY changeBlockList.label "Change Block List"> -<!ENTITY changeBlockList.accesskey "C"> - -<!-- LOCALIZATION NOTE (doNotTrack.pre.label): include a trailing space as needed --> -<!-- LOCALIZATION NOTE (doNotTrack.post.label): include a starting space as needed --> -<!ENTITY doNotTrack.pre.label "You can also "> -<!ENTITY doNotTrack.settings.label "manage your Do Not Track settings"> -<!ENTITY doNotTrack.post.label "."> -#else <!ENTITY doNotTrack.label "Send a signal that you don’t want to be tracked"> <!ENTITY doNotTrack.accesskey "T"> <!ENTITY doNotTrackLearnMore.label "Learn More"> -#endif <!ENTITY history.label "History"> diff --git a/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd b/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd deleted file mode 100644 index 33d2202..0000000 --- a/basilisk/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd +++ /dev/null @@ -1,32 +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/. --> - -<!ENTITY safeb.palm.accept.label "Get me out of here!"> -<!ENTITY safeb.palm.decline.label "Ignore this warning"> -<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu - item. Either this or reportDeceptiveSiteMenu.label from report-phishing.dtd is - shown. --> -<!ENTITY safeb.palm.notdeceptive.label "This isn’t a deceptive site…"> -<!-- Localization note (safeb.palm.notdeceptive.accesskey) - Because - safeb.palm.notdeceptive.label and reportDeceptiveSiteMenu.title from - report-phishing.dtd are never shown at the same time, the same accesskey can - be used for them. --> -<!ENTITY safeb.palm.notdeceptive.accesskey "d"> -<!ENTITY safeb.palm.reportPage.label "Why was this page blocked?"> - -<!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!"> -<!-- Localization note (safeb.blocked.malwarePage.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) --> -<!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences."> -<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>"> - -<!ENTITY safeb.blocked.unwantedPage.title "Reported Unwanted Software Page!"> -<!-- Localization note (safeb.blocked.unwantedPage.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) --> -<!ENTITY safeb.blocked.unwantedPage.shortDesc "This web page at <span id='unwanted_sitename'/> has been reported to contain unwanted software and has been blocked based on your security preferences."> -<!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>"> - -<!ENTITY safeb.blocked.phishingPage.title2 "Deceptive Site!"> -<!-- Localization note (safeb.blocked.phishingPage.shortDesc2) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) --> -<!ENTITY safeb.blocked.phishingPage.shortDesc2 "This web page at <span id='phishing_sitename'/> has been reported as a deceptive site and has been blocked based on your security preferences."> -<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>Deceptive sites are designed to trick you into doing something dangerous, like installing software, or revealing your personal information, like passwords, phone numbers or credit cards.</p><p>Entering any information on this web page may result in identity theft or other fraud.</p>"> - diff --git a/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd b/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd deleted file mode 100644 index 7444bcb..0000000 --- a/basilisk/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd +++ /dev/null @@ -1,13 +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/. --> - -<!-- Localization note (reportDeceptiveSiteMenu.title) - Label of the Help menu - item. Either this or safeb.palm.notdeceptive.label from - phishing-afterload-warning-message.dtd is shown. --> -<!ENTITY reportDeceptiveSiteMenu.title "Report deceptive site…"> -<!-- Localization note (reportDeceptiveSiteMenu.accesskey) - Because - safeb.palm.notdeceptive.label from phishing-afterload-warning-message.dtd and - reportDeceptiveSiteMenu.title are never shown at the same time, the same - accesskey can be used for them. --> -<!ENTITY reportDeceptiveSiteMenu.accesskey "D"> diff --git a/basilisk/locales/jar.mn b/basilisk/locales/jar.mn index 345c052..c59734a 100644 --- a/basilisk/locales/jar.mn +++ b/basilisk/locales/jar.mn @@ -6,114 +6,99 @@ @AB_CD@.jar: % locale browser @AB_CD@ %locale/browser/ -* locale/browser/bookmarks.html (generic/profile/bookmarks.html.in) - locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) - locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) - locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties) -* locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) - locale/browser/accounts.properties (%chrome/browser/accounts.properties) +* locale/browser/bookmarks.html (generic/profile/bookmarks.html.in) + locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) + locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) + locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties) +* locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) + locale/browser/accounts.properties (%chrome/browser/accounts.properties) #ifdef MOZ_SERVICES_HEALTHREPORT - locale/browser/aboutHealthReport.dtd (%chrome/browser/aboutHealthReport.dtd) + locale/browser/aboutHealthReport.dtd (%chrome/browser/aboutHealthReport.dtd) #endif - locale/browser/aboutSearchReset.dtd (%chrome/browser/aboutSearchReset.dtd) - locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd) - locale/browser/aboutTabCrashed.dtd (%chrome/browser/aboutTabCrashed.dtd) - locale/browser/syncCustomize.dtd (%chrome/browser/syncCustomize.dtd) -* locale/browser/browser.dtd (%chrome/browser/browser.dtd) - locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd) - locale/browser/browser.properties (%chrome/browser/browser.properties) - locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) - locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties) - locale/browser/newTab.dtd (%chrome/browser/newTab.dtd) - locale/browser/newTab.properties (%chrome/browser/newTab.properties) - locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd) - locale/browser/pageInfo.properties (%chrome/browser/pageInfo.properties) - locale/browser/quitDialog.properties (%chrome/browser/quitDialog.properties) - locale/browser/safeMode.dtd (%chrome/browser/safeMode.dtd) - locale/browser/sanitize.dtd (%chrome/browser/sanitize.dtd) - locale/browser/search.properties (%chrome/browser/search.properties) - locale/browser/searchbar.dtd (%chrome/browser/searchbar.dtd) - locale/browser/sitePermissions.properties (%chrome/browser/sitePermissions.properties) - locale/browser/engineManager.properties (%chrome/browser/engineManager.properties) - locale/browser/setDesktopBackground.dtd (%chrome/browser/setDesktopBackground.dtd) - locale/browser/shellservice.properties (%chrome/browser/shellservice.properties) - locale/browser/tabbrowser.properties (%chrome/browser/tabbrowser.properties) - locale/browser/taskbar.properties (%chrome/browser/taskbar.properties) - locale/browser/webrtcIndicator.properties (%chrome/browser/webrtcIndicator.properties) - locale/browser/downloads/downloads.dtd (%chrome/browser/downloads/downloads.dtd) - locale/browser/downloads/downloads.properties (%chrome/browser/downloads/downloads.properties) - locale/browser/places/places.dtd (%chrome/browser/places/places.dtd) - locale/browser/places/places.properties (%chrome/browser/places/places.properties) - locale/browser/places/editBookmarkOverlay.dtd (%chrome/browser/places/editBookmarkOverlay.dtd) - locale/browser/places/bookmarkProperties.properties (%chrome/browser/places/bookmarkProperties.properties) - locale/browser/preferences/selectBookmark.dtd (%chrome/browser/preferences/selectBookmark.dtd) - locale/browser/places/moveBookmarks.dtd (%chrome/browser/places/moveBookmarks.dtd) -#ifdef MOZ_SAFE_BROWSING - locale/browser/safebrowsing/phishing-afterload-warning-message.dtd (%chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd) - locale/browser/safebrowsing/report-phishing.dtd (%chrome/browser/safebrowsing/report-phishing.dtd) -#endif - locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) - locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) - locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd) - locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties) - locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd) - locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd) - locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties) -#ifdef MOZ_SAFE_BROWSING - locale/browser/preferences/blocklists.dtd (%chrome/browser/preferences/blocklists.dtd) -#endif - locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd) - locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) - locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) - locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) -#ifdef MOZ_SAFE_BROWSING - locale/browser/preferences/donottrack.dtd (%chrome/browser/preferences/donottrack.dtd) -#endif - locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) - locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) - locale/browser/preferences/main.dtd (%chrome/browser/preferences/main.dtd) - locale/browser/preferences/languages.dtd (%chrome/browser/preferences/languages.dtd) - locale/browser/preferences/permissions.dtd (%chrome/browser/preferences/permissions.dtd) - locale/browser/preferences/preferences.dtd (%chrome/browser/preferences/preferences.dtd) - locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties) -* locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd) - locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd) + locale/browser/aboutSearchReset.dtd (%chrome/browser/aboutSearchReset.dtd) + locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd) + locale/browser/aboutTabCrashed.dtd (%chrome/browser/aboutTabCrashed.dtd) + locale/browser/syncCustomize.dtd (%chrome/browser/syncCustomize.dtd) +* locale/browser/browser.dtd (%chrome/browser/browser.dtd) + locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd) + locale/browser/browser.properties (%chrome/browser/browser.properties) + locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) + locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties) + locale/browser/newTab.dtd (%chrome/browser/newTab.dtd) + locale/browser/newTab.properties (%chrome/browser/newTab.properties) + locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd) + locale/browser/pageInfo.properties (%chrome/browser/pageInfo.properties) + locale/browser/quitDialog.properties (%chrome/browser/quitDialog.properties) + locale/browser/safeMode.dtd (%chrome/browser/safeMode.dtd) + locale/browser/sanitize.dtd (%chrome/browser/sanitize.dtd) + locale/browser/search.properties (%chrome/browser/search.properties) + locale/browser/searchbar.dtd (%chrome/browser/searchbar.dtd) + locale/browser/sitePermissions.properties (%chrome/browser/sitePermissions.properties) + locale/browser/engineManager.properties (%chrome/browser/engineManager.properties) + locale/browser/setDesktopBackground.dtd (%chrome/browser/setDesktopBackground.dtd) + locale/browser/shellservice.properties (%chrome/browser/shellservice.properties) + locale/browser/tabbrowser.properties (%chrome/browser/tabbrowser.properties) + locale/browser/taskbar.properties (%chrome/browser/taskbar.properties) + locale/browser/webrtcIndicator.properties (%chrome/browser/webrtcIndicator.properties) + locale/browser/downloads/downloads.dtd (%chrome/browser/downloads/downloads.dtd) + locale/browser/downloads/downloads.properties (%chrome/browser/downloads/downloads.properties) + locale/browser/places/places.dtd (%chrome/browser/places/places.dtd) + locale/browser/places/places.properties (%chrome/browser/places/places.properties) + locale/browser/places/editBookmarkOverlay.dtd (%chrome/browser/places/editBookmarkOverlay.dtd) + locale/browser/places/bookmarkProperties.properties (%chrome/browser/places/bookmarkProperties.properties) + locale/browser/preferences/selectBookmark.dtd (%chrome/browser/preferences/selectBookmark.dtd) + locale/browser/places/moveBookmarks.dtd (%chrome/browser/places/moveBookmarks.dtd) + locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) + locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) + locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd) + locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties) + locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd) + locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd) + locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties) + locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd) + locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) + locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) + locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) + locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) + locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) + locale/browser/preferences/main.dtd (%chrome/browser/preferences/main.dtd) + locale/browser/preferences/languages.dtd (%chrome/browser/preferences/languages.dtd) + locale/browser/preferences/permissions.dtd (%chrome/browser/preferences/permissions.dtd) + locale/browser/preferences/preferences.dtd (%chrome/browser/preferences/preferences.dtd) + locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties) +* locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd) + locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd) #ifdef MOZ_SERVICES_SYNC - locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd) + locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd) #endif - locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd) - locale/browser/preferences/search.dtd (%chrome/browser/preferences/search.dtd) + locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd) + locale/browser/preferences/search.dtd (%chrome/browser/preferences/search.dtd) #ifdef MOZ_SERVICES_SYNC - locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd) - locale/browser/syncSetup.dtd (%chrome/browser/syncSetup.dtd) - locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) - locale/browser/syncGenericChange.properties (%chrome/browser/syncGenericChange.properties) - locale/browser/syncKey.dtd (%chrome/browser/syncKey.dtd) - locale/browser/syncQuota.dtd (%chrome/browser/syncQuota.dtd) - locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) - locale/browser/syncProgress.dtd (%chrome/browser/syncProgress.dtd) - locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd) + locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd) + locale/browser/syncSetup.dtd (%chrome/browser/syncSetup.dtd) + locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) + locale/browser/syncGenericChange.properties (%chrome/browser/syncGenericChange.properties) + locale/browser/syncKey.dtd (%chrome/browser/syncKey.dtd) + locale/browser/syncQuota.dtd (%chrome/browser/syncQuota.dtd) + locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) + locale/browser/syncProgress.dtd (%chrome/browser/syncProgress.dtd) + locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd) #endif % resource search-plugins chrome://browser/locale/searchplugins/ -#if BUILD_FASTER - locale/browser/searchplugins/ (searchplugins/*.xml) - locale/browser/searchplugins/list.json (search/list.json) -#else - locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) - locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) -#endif + locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) + locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) % locale browser-region @AB_CD@ %locale/browser-region/ - locale/browser-region/region.properties (%chrome/browser-region/region.properties) + locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides - locale/browser/netError.dtd (%chrome/overrides/netError.dtd) - locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) - locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) + locale/browser/netError.dtd (%chrome/overrides/netError.dtd) + locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) + locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd % locale pdf.js @AB_CD@ %locale/pdfviewer/ - locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) - locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) + locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) + locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) #ifdef XPI_NAME # Bug 1240628, restructure how l10n repacks work with feature addons diff --git a/basilisk/modules/BrowserUsageTelemetry.jsm b/basilisk/modules/BrowserUsageTelemetry.jsm deleted file mode 100644 index 39012d2..0000000 --- a/basilisk/modules/BrowserUsageTelemetry.jsm +++ /dev/null @@ -1,468 +0,0 @@ -/* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */ -/* 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/. */ - -"use strict"; - -this.EXPORTED_SYMBOLS = ["BrowserUsageTelemetry"]; - -const {classes: Cc, interfaces: Ci, utils: Cu} = Components; - -Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); - -XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", - "resource://gre/modules/PrivateBrowsingUtils.jsm"); - -// The upper bound for the count of the visited unique domain names. -const MAX_UNIQUE_VISITED_DOMAINS = 100; - -// Observed topic names. -const WINDOWS_RESTORED_TOPIC = "sessionstore-windows-restored"; -const TAB_RESTORING_TOPIC = "SSTabRestoring"; -const TELEMETRY_SUBSESSIONSPLIT_TOPIC = "internal-telemetry-after-subsession-split"; -const DOMWINDOW_OPENED_TOPIC = "domwindowopened"; - -// Probe names. -const MAX_TAB_COUNT_SCALAR_NAME = "browser.engagement.max_concurrent_tab_count"; -const MAX_WINDOW_COUNT_SCALAR_NAME = "browser.engagement.max_concurrent_window_count"; -const TAB_OPEN_EVENT_COUNT_SCALAR_NAME = "browser.engagement.tab_open_event_count"; -const WINDOW_OPEN_EVENT_COUNT_SCALAR_NAME = "browser.engagement.window_open_event_count"; -const UNIQUE_DOMAINS_COUNT_SCALAR_NAME = "browser.engagement.unique_domains_count"; -const TOTAL_URI_COUNT_SCALAR_NAME = "browser.engagement.total_uri_count"; -const UNFILTERED_URI_COUNT_SCALAR_NAME = "browser.engagement.unfiltered_uri_count"; - -// A list of known search origins. -const KNOWN_SEARCH_SOURCES = [ - "abouthome", - "contextmenu", - "newtab", - "searchbar", - "urlbar", -]; - -const KNOWN_ONEOFF_SOURCES = [ - "oneoff-urlbar", - "oneoff-searchbar", - "unknown", // Edge case: this is the searchbar (see bug 1195733 comment 7). -]; - -function getOpenTabsAndWinsCounts() { - let tabCount = 0; - let winCount = 0; - - let browserEnum = Services.wm.getEnumerator("navigator:browser"); - while (browserEnum.hasMoreElements()) { - let win = browserEnum.getNext(); - winCount++; - tabCount += win.gBrowser.tabs.length; - } - - return { tabCount, winCount }; -} - -function getSearchEngineId(engine) { - if (engine) { - if (engine.identifier) { - return engine.identifier; - } - // Due to bug 1222070, we can't directly check Services.telemetry.canRecordExtended - // here. - const extendedTelemetry = Services.prefs.getBoolPref("toolkit.telemetry.enabled"); - if (engine.name && extendedTelemetry) { - // If it's a custom search engine only report the engine name - // if extended Telemetry is enabled. - return "other-" + engine.name; - } - } - return "other"; -} - -let URICountListener = { - // A set containing the visited domains, see bug 1271310. - _domainSet: new Set(), - // A map to keep track of the URIs loaded from the restored tabs. - _restoredURIsMap: new WeakMap(), - - isHttpURI(uri) { - // Only consider http(s) schemas. - return uri.schemeIs("http") || uri.schemeIs("https"); - }, - - addRestoredURI(browser, uri) { - if (!this.isHttpURI(uri)) { - return; - } - - this._restoredURIsMap.set(browser, uri.spec); - }, - - onLocationChange(browser, webProgress, request, uri, flags) { - // Don't count this URI if it's an error page. - if (flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) { - return; - } - - // We only care about top level loads. - if (!webProgress.isTopLevel) { - return; - } - - // The SessionStore sets the URI of a tab first, firing onLocationChange the - // first time, then manages content loading using its scheduler. Once content - // loads, we will hit onLocationChange again. - // We can catch the first case by checking for null requests: be advised that - // this can also happen when navigating page fragments, so account for it. - if (!request && - !(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT)) { - return; - } - - // Track URI loads, even if they're not http(s). - let uriSpec = null; - try { - uriSpec = uri.spec; - } catch (e) { - // If we have troubles parsing the spec, still count this as - // an unfiltered URI. - Services.telemetry.scalarAdd(UNFILTERED_URI_COUNT_SCALAR_NAME, 1); - return; - } - - - // Don't count about:blank and similar pages, as they would artificially - // inflate the counts. - if (browser.ownerDocument.defaultView.gInitialPages.includes(uriSpec)) { - return; - } - - // If the URI we're loading is in the _restoredURIsMap, then it comes from a - // restored tab. If so, let's skip it and remove it from the map as we want to - // count page refreshes. - if (this._restoredURIsMap.get(browser) === uriSpec) { - this._restoredURIsMap.delete(browser); - return; - } - - // The URI wasn't from a restored tab. Count it among the unfiltered URIs. - // If this is an http(s) URI, this also gets counted by the "total_uri_count" - // probe. - Services.telemetry.scalarAdd(UNFILTERED_URI_COUNT_SCALAR_NAME, 1); - - if (!this.isHttpURI(uri)) { - return; - } - - // Update the URI counts. - Services.telemetry.scalarAdd(TOTAL_URI_COUNT_SCALAR_NAME, 1); - - // We only want to count the unique domains up to MAX_UNIQUE_VISITED_DOMAINS. - if (this._domainSet.size == MAX_UNIQUE_VISITED_DOMAINS) { - return; - } - - // Unique domains should be aggregated by (eTLD + 1): x.test.com and y.test.com - // are counted once as test.com. - try { - // Even if only considering http(s) URIs, |getBaseDomain| could still throw - // due to the URI containing invalid characters or the domain actually being - // an ipv4 or ipv6 address. - this._domainSet.add(Services.eTLD.getBaseDomain(uri)); - } catch (e) { - return; - } - - Services.telemetry.scalarSet(UNIQUE_DOMAINS_COUNT_SCALAR_NAME, this._domainSet.size); - }, - - /** - * Reset the counts. This should be called when breaking a session in Telemetry. - */ - reset() { - this._domainSet.clear(); - }, - - QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener, - Ci.nsISupportsWeakReference]), -}; - -let BrowserUsageTelemetry = { - init() { - Services.obs.addObserver(this, WINDOWS_RESTORED_TOPIC, false); - }, - - /** - * Handle subsession splits in the parent process. - */ - afterSubsessionSplit() { - // Scalars just got cleared due to a subsession split. We need to set the maximum - // concurrent tab and window counts so that they reflect the correct value for the - // new subsession. - const counts = getOpenTabsAndWinsCounts(); - Services.telemetry.scalarSetMaximum(MAX_TAB_COUNT_SCALAR_NAME, counts.tabCount); - Services.telemetry.scalarSetMaximum(MAX_WINDOW_COUNT_SCALAR_NAME, counts.winCount); - - // Reset the URI counter. - URICountListener.reset(); - }, - - uninit() { - Services.obs.removeObserver(this, DOMWINDOW_OPENED_TOPIC, false); - Services.obs.removeObserver(this, TELEMETRY_SUBSESSIONSPLIT_TOPIC, false); - Services.obs.removeObserver(this, WINDOWS_RESTORED_TOPIC, false); - }, - - observe(subject, topic, data) { - switch (topic) { - case WINDOWS_RESTORED_TOPIC: - this._setupAfterRestore(); - break; - case DOMWINDOW_OPENED_TOPIC: - this._onWindowOpen(subject); - break; - case TELEMETRY_SUBSESSIONSPLIT_TOPIC: - this.afterSubsessionSplit(); - break; - } - }, - - handleEvent(event) { - switch (event.type) { - case "TabOpen": - this._onTabOpen(); - break; - case "unload": - this._unregisterWindow(event.target); - break; - case TAB_RESTORING_TOPIC: - // We're restoring a new tab from a previous or crashed session. - // We don't want to track the URIs from these tabs, so let - // |URICountListener| know about them. - let browser = event.target.linkedBrowser; - URICountListener.addRestoredURI(browser, browser.currentURI); - break; - } - }, - - /** - * The main entry point for recording search related Telemetry. This includes - * search counts and engagement measurements. - * - * Telemetry records only search counts per engine and action origin, but - * nothing pertaining to the search contents themselves. - * - * @param {nsISearchEngine} engine - * The engine handling the search. - * @param {String} source - * Where the search originated from. See KNOWN_SEARCH_SOURCES for allowed - * values. - * @param {Object} [details] Options object. - * @param {Boolean} [details.isOneOff=false] - * true if this event was generated by a one-off search. - * @param {Boolean} [details.isSuggestion=false] - * true if this event was generated by a suggested search. - * @param {Boolean} [details.isAlias=false] - * true if this event was generated by a search using an alias. - * @param {Object} [details.type=null] - * The object describing the event that triggered the search. - * @throws if source is not in the known sources list. - */ - recordSearch(engine, source, details={}) { - const isOneOff = !!details.isOneOff; - const countId = getSearchEngineId(engine) + "." + source; - - if (isOneOff) { - if (!KNOWN_ONEOFF_SOURCES.includes(source)) { - // Silently drop the error if this bogus call - // came from 'urlbar' or 'searchbar'. They're - // calling |recordSearch| twice from two different - // code paths because they want to record the search - // in SEARCH_COUNTS. - if (['urlbar', 'searchbar'].includes(source)) { - Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS").add(countId); - return; - } - throw new Error("Unknown source for one-off search: " + source); - } - } else { - if (!KNOWN_SEARCH_SOURCES.includes(source)) { - throw new Error("Unknown source for search: " + source); - } - Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS").add(countId); - } - - // Dispatch the search signal to other handlers. - this._handleSearchAction(engine, source, details); - }, - - _recordSearch(engine, source, action = null) { - let scalarKey = action ? "search_" + action : "search"; - Services.telemetry.keyedScalarAdd("browser.engagement.navigation." + source, - scalarKey, 1); - Services.telemetry.recordEvent("navigation", "search", source, action, - { engine: getSearchEngineId(engine) }); - }, - - _handleSearchAction(engine, source, details) { - switch (source) { - case "urlbar": - case "oneoff-urlbar": - case "searchbar": - case "oneoff-searchbar": - case "unknown": // Edge case: this is the searchbar (see bug 1195733 comment 7). - this._handleSearchAndUrlbar(engine, source, details); - break; - case "abouthome": - this._recordSearch(engine, "about_home", "enter"); - break; - case "newtab": - this._recordSearch(engine, "about_newtab", "enter"); - break; - case "contextmenu": - this._recordSearch(engine, "contextmenu"); - break; - } - }, - - /** - * This function handles the "urlbar", "urlbar-oneoff", "searchbar" and - * "searchbar-oneoff" sources. - */ - _handleSearchAndUrlbar(engine, source, details) { - // We want "urlbar" and "urlbar-oneoff" (and similar cases) to go in the same - // scalar, but in a different key. - - // When using one-offs in the searchbar we get an "unknown" source. See bug - // 1195733 comment 7 for the context. Fix-up the label here. - const sourceName = - (source === "unknown") ? "searchbar" : source.replace("oneoff-", ""); - - const isOneOff = !!details.isOneOff; - if (isOneOff) { - // We will receive a signal from the "urlbar"/"searchbar" even when the - // search came from "oneoff-urlbar". That's because both signals - // are propagated from search.xml. Skip it if that's the case. - // Moreover, we skip the "unknown" source that comes from the searchbar - // when performing searches from the default search engine. See bug 1195733 - // comment 7 for context. - if (["urlbar", "searchbar", "unknown"].includes(source)) { - return; - } - - // If that's a legit one-off search signal, record it using the relative key. - this._recordSearch(engine, sourceName, "oneoff"); - return; - } - - // The search was not a one-off. It was a search with the default search engine. - if (details.isSuggestion) { - // It came from a suggested search, so count it as such. - this._recordSearch(engine, sourceName, "suggestion"); - return; - } else if (details.isAlias) { - // This one came from a search that used an alias. - this._recordSearch(engine, sourceName, "alias"); - return; - } - - // The search signal was generated by typing something and pressing enter. - this._recordSearch(engine, sourceName, "enter"); - }, - - /** - * This gets called shortly after the SessionStore has finished restoring - * windows and tabs. It counts the open tabs and adds listeners to all the - * windows. - */ - _setupAfterRestore() { - // Make sure to catch new chrome windows and subsession splits. - Services.obs.addObserver(this, DOMWINDOW_OPENED_TOPIC, false); - Services.obs.addObserver(this, TELEMETRY_SUBSESSIONSPLIT_TOPIC, false); - - // Attach the tabopen handlers to the existing Windows. - let browserEnum = Services.wm.getEnumerator("navigator:browser"); - while (browserEnum.hasMoreElements()) { - this._registerWindow(browserEnum.getNext()); - } - - // Get the initial tab and windows max counts. - const counts = getOpenTabsAndWinsCounts(); - Services.telemetry.scalarSetMaximum(MAX_TAB_COUNT_SCALAR_NAME, counts.tabCount); - Services.telemetry.scalarSetMaximum(MAX_WINDOW_COUNT_SCALAR_NAME, counts.winCount); - }, - - /** - * Adds listeners to a single chrome window. - */ - _registerWindow(win) { - win.addEventListener("unload", this); - win.addEventListener("TabOpen", this, true); - - // Don't include URI and domain counts when in private mode. - if (PrivateBrowsingUtils.isWindowPrivate(win)) { - return; - } - win.gBrowser.tabContainer.addEventListener(TAB_RESTORING_TOPIC, this); - win.gBrowser.addTabsProgressListener(URICountListener); - }, - - /** - * Removes listeners from a single chrome window. - */ - _unregisterWindow(win) { - win.removeEventListener("unload", this); - win.removeEventListener("TabOpen", this, true); - - // Don't include URI and domain counts when in private mode. - if (PrivateBrowsingUtils.isWindowPrivate(win.defaultView)) { - return; - } - win.defaultView.gBrowser.tabContainer.removeEventListener(TAB_RESTORING_TOPIC, this); - win.defaultView.gBrowser.removeTabsProgressListener(URICountListener); - }, - - /** - * Updates the tab counts. - * @param {Number} [newTabCount=0] The count of the opened tabs across all windows. This - * is computed manually if not provided. - */ - _onTabOpen(tabCount = 0) { - // Use the provided tab count if available. Otherwise, go on and compute it. - tabCount = tabCount || getOpenTabsAndWinsCounts().tabCount; - // Update the "tab opened" count and its maximum. - Services.telemetry.scalarAdd(TAB_OPEN_EVENT_COUNT_SCALAR_NAME, 1); - Services.telemetry.scalarSetMaximum(MAX_TAB_COUNT_SCALAR_NAME, tabCount); - }, - - /** - * Tracks the window count and registers the listeners for the tab count. - * @param{Object} win The window object. - */ - _onWindowOpen(win) { - // Make sure to have a |nsIDOMWindow|. - if (!(win instanceof Ci.nsIDOMWindow)) { - return; - } - - let onLoad = () => { - win.removeEventListener("load", onLoad, false); - - // Ignore non browser windows. - if (win.document.documentElement.getAttribute("windowtype") != "navigator:browser") { - return; - } - - this._registerWindow(win); - // Track the window open event and check the maximum. - const counts = getOpenTabsAndWinsCounts(); - Services.telemetry.scalarAdd(WINDOW_OPEN_EVENT_COUNT_SCALAR_NAME, 1); - Services.telemetry.scalarSetMaximum(MAX_WINDOW_COUNT_SCALAR_NAME, counts.winCount); - - // We won't receive the "TabOpen" event for the first tab within a new window. - // Account for that. - this._onTabOpen(counts.tabCount); - }; - win.addEventListener("load", onLoad, false); - }, -}; diff --git a/basilisk/modules/ContentCrashHandlers.jsm b/basilisk/modules/ContentCrashHandlers.jsm index 488cc4f..4319c43 100644 --- a/basilisk/modules/ContentCrashHandlers.jsm +++ b/basilisk/modules/ContentCrashHandlers.jsm @@ -86,12 +86,6 @@ this.TabCrashHandler = { let childID = aSubject.get("childID"); let dumpID = aSubject.get("dumpID"); - if (!dumpID) { - Services.telemetry - .getHistogramById("FX_CONTENT_CRASH_DUMP_UNAVAILABLE") - .add(1); - } - if (!this.flushCrashedBrowserQueue(childID)) { this.unseenCrashedChildIDs.push(childID); // The elements in unseenCrashedChildIDs will only be removed if @@ -375,12 +369,6 @@ this.TabCrashHandler = { data.email = this.prefs.getCharPref("email", ""); } - // Make sure to only count once even if there are multiple windows - // that will all show about:tabcrashed. - if (this._crashedTabCount == 1) { - Services.telemetry.getHistogramById("FX_CONTENT_CRASH_PRESENTED").add(1); - } - message.target.sendAsyncMessage("SetCrashReportAvailable", data); }, @@ -402,11 +390,6 @@ this.TabCrashHandler = { let browser = message.target.browser; let childID = this.browserMap.get(browser.permanentKey); - // Make sure to only count once even if there are multiple windows - // that will all show about:tabcrashed. - if (this._crashedTabCount == 0 && childID) { - Services.telemetry.getHistogramById("FX_CONTENT_CRASH_NOT_SUBMITTED").add(1); - } }, /** diff --git a/basilisk/modules/ContentLinkHandler.jsm b/basilisk/modules/ContentLinkHandler.jsm index 443cae2..76822e8 100644 --- a/basilisk/modules/ContentLinkHandler.jsm +++ b/basilisk/modules/ContentLinkHandler.jsm @@ -19,13 +19,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Feeds", XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"); -const SIZES_TELEMETRY_ENUM = { - NO_SIZES: 0, - ANY: 1, - DIMENSION: 2, - INVALID: 3, -}; - this.ContentLinkHandler = { init: function(chromeGlobal) { chromeGlobal.addEventListener("DOMLinkAdded", (event) => { @@ -79,35 +72,6 @@ this.ContentLinkHandler = { if (!uri) break; - // Telemetry probes for measuring the sizes attribute - // usage and available dimensions. - let sizeHistogramTypes = Services.telemetry. - getHistogramById("LINK_ICON_SIZES_ATTR_USAGE"); - let sizeHistogramDimension = Services.telemetry. - getHistogramById("LINK_ICON_SIZES_ATTR_DIMENSION"); - let sizesType; - if (link.sizes.length) { - for (let size of link.sizes) { - if (size.toLowerCase() == "any") { - sizesType = SIZES_TELEMETRY_ENUM.ANY; - break; - } else { - let re = /^([1-9][0-9]*)x[1-9][0-9]*$/i; - let values = re.exec(size); - if (values && values.length > 1) { - sizesType = SIZES_TELEMETRY_ENUM.DIMENSION; - sizeHistogramDimension.add(parseInt(values[1])); - } else { - sizesType = SIZES_TELEMETRY_ENUM.INVALID; - break; - } - } - } - } else { - sizesType = SIZES_TELEMETRY_ENUM.NO_SIZES; - } - sizeHistogramTypes.add(sizesType); - chromeGlobal.sendAsyncMessage( "Link:SetIcon", {url: uri.spec, loadingPrincipal: link.ownerDocument.nodePrincipal}); diff --git a/basilisk/modules/ContentSearch.jsm b/basilisk/modules/ContentSearch.jsm index 91b0b9a..8e10b79 100644 --- a/basilisk/modules/ContentSearch.jsm +++ b/basilisk/modules/ContentSearch.jsm @@ -254,8 +254,6 @@ this.ContentSearch = { }; win.openUILinkIn(submission.uri.spec, where, params); } - win.BrowserSearch.recordSearchInTelemetry(engine, data.healthReportKey, - { selection: data.selection }); return; }, diff --git a/basilisk/modules/PermissionUI.jsm b/basilisk/modules/PermissionUI.jsm index 5c8b944..984f95c 100644 --- a/basilisk/modules/PermissionUI.jsm +++ b/basilisk/modules/PermissionUI.jsm @@ -234,9 +234,7 @@ this.PermissionPromptPrototype = { /** * If the prompt will be shown to the user, this callback will - * be called just before. Subclasses may want to override this - * in order to, for example, bump a counter Telemetry probe for - * how often a particular permission request is seen. + * be called just before. Subclasses may want to override this. */ onBeforeShow() {}, diff --git a/basilisk/modules/PluginContent.jsm b/basilisk/modules/PluginContent.jsm index 622d608..7317b19 100644 --- a/basilisk/modules/PluginContent.jsm +++ b/basilisk/modules/PluginContent.jsm @@ -167,7 +167,6 @@ PluginContent.prototype = { return; } - this._finishRecordingFlashPluginTelemetry(); this.clearPluginCaches(); this.haveShownNotification = false; }, @@ -533,19 +532,11 @@ PluginContent.prototype = { case "PluginInstantiated": let key = this._getPluginInfo(plugin).pluginTag.niceName; - Services.telemetry.getKeyedHistogramById('PLUGIN_ACTIVATION_COUNT').add(key); shouldShowNotification = true; let pluginRect = plugin.getBoundingClientRect(); - if (pluginRect.width <= 5 && pluginRect.height <= 5) { - Services.telemetry.getHistogramById('PLUGIN_TINY_CONTENT').add(1); - } break; } - if (this._getPluginInfo(plugin).mimetype === FLASH_MIME_TYPE) { - this._recordFlashPluginTelemetry(eventType, plugin); - } - // Show the in-content UI if it's not too big. The crashed plugin handler already did this. let overlay = this.getPluginUI(plugin, "main"); if (eventType != "PluginCrashed") { @@ -577,48 +568,6 @@ PluginContent.prototype = { } }, - _recordFlashPluginTelemetry: function (eventType, plugin) { - if (!Services.telemetry.canRecordExtended) { - return; - } - - if (!this.flashPluginStats) { - this.flashPluginStats = { - instancesCount: 0, - plugins: new WeakSet() - }; - } - - if (!this.flashPluginStats.plugins.has(plugin)) { - // Reporting plugin instance and its dimensions only once. - this.flashPluginStats.plugins.add(plugin); - - this.flashPluginStats.instancesCount++; - - let pluginRect = plugin.getBoundingClientRect(); - Services.telemetry.getHistogramById('FLASH_PLUGIN_WIDTH') - .add(pluginRect.width); - Services.telemetry.getHistogramById('FLASH_PLUGIN_HEIGHT') - .add(pluginRect.height); - Services.telemetry.getHistogramById('FLASH_PLUGIN_AREA') - .add(pluginRect.width * pluginRect.height); - - let state = this._getPluginInfo(plugin).fallbackType; - if (state === null) { - state = Ci.nsIObjectLoadingContent.PLUGIN_UNSUPPORTED; - } - Services.telemetry.getHistogramById('FLASH_PLUGIN_STATES') - .add(state); - } - }, - - _finishRecordingFlashPluginTelemetry: function () { - if (this.flashPluginStats) { - Services.telemetry.getHistogramById('FLASH_PLUGIN_INSTANCES_ON_PAGE') - .add(this.flashPluginStats.instancesCount); - delete this.flashPluginStats; - } - }, isKnownPlugin: function (objLoadingContent) { return (objLoadingContent.getContentTypeForMIMEType(objLoadingContent.actualType) == diff --git a/basilisk/modules/ProcessHangMonitor.jsm b/basilisk/modules/ProcessHangMonitor.jsm index 80c506a..1e4c192 100644 --- a/basilisk/modules/ProcessHangMonitor.jsm +++ b/basilisk/modules/ProcessHangMonitor.jsm @@ -364,17 +364,6 @@ var ProcessHangMonitor = { return; } - // On e10s this counts slow-script/hanged-plugin notice only once. - // This code is not reached on non-e10s. - if (report.hangType == report.SLOW_SCRIPT) { - // On non-e10s, SLOW_SCRIPT_NOTICE_COUNT is probed at nsGlobalWindow.cpp - Services.telemetry.getHistogramById("SLOW_SCRIPT_NOTICE_COUNT").add(); - } else if (report.hangType == report.PLUGIN_HANG) { - // On non-e10s we have sufficient plugin telemetry probes, - // so PLUGIN_HANG_NOTICE_COUNT is only probed on e10s. - Services.telemetry.getHistogramById("PLUGIN_HANG_NOTICE_COUNT").add(); - } - this._activeReports.add(report); this.updateWindows(); }, diff --git a/basilisk/modules/moz.build b/basilisk/modules/moz.build index 26661db..881ff98 100644 --- a/basilisk/modules/moz.build +++ b/basilisk/modules/moz.build @@ -7,7 +7,6 @@ EXTRA_JS_MODULES += [ 'AboutHome.jsm', 'AboutNewTab.jsm', 'AttributionCode.jsm', - 'BrowserUsageTelemetry.jsm', 'ContentClick.jsm', 'ContentCrashHandlers.jsm', 'ContentLinkHandler.jsm', diff --git a/basilisk/moz.build b/basilisk/moz.build index 7166b81..74a63c7 100644 --- a/basilisk/moz.build +++ b/basilisk/moz.build @@ -29,10 +29,3 @@ TEST_DIRS += [ DIST_SUBDIR = 'browser' export('DIST_SUBDIR') - -if CONFIG['MOZ_ARTIFACT_BUILDS']: - # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact - # code is included by the top-level chrome.manifest. - EXTRA_COMPONENTS += [ - '../../build/prebuilt-interfaces.manifest', - ] diff --git a/basilisk/themes/shared/incontentprefs/preferences.inc.css b/basilisk/themes/shared/incontentprefs/preferences.inc.css index 20ea983..9f0b0d6 100644 --- a/basilisk/themes/shared/incontentprefs/preferences.inc.css +++ b/basilisk/themes/shared/incontentprefs/preferences.inc.css @@ -236,13 +236,6 @@ treecol { /* Privacy pane */ -#trackingProtectionPBMLearnMore, -#trackingProtectionLearnMore { - margin-inline-start: 1.5em !important; - margin-top: 0; - font-weight: normal; -} - .doNotTrackLearnMore { margin-inline-start: calc(1em + 30px); margin-bottom: 1em; diff --git a/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm b/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm index 1201ed6..e9c98ae 100644 --- a/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm +++ b/basilisk/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm @@ -183,40 +183,6 @@ this.ControlCenter = { }), }, - trackingProtectionNoElements: { - applyConfig: Task.async(function* () { - Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true); - - yield loadPage(HTTP_PAGE); - yield openIdentityPopup(); - }), - }, - - trackingProtectionEnabled: { - applyConfig: Task.async(function* () { - Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true); - yield UrlClassifierTestUtils.addTestTrackers(); - - yield loadPage(TRACKING_PAGE); - yield openIdentityPopup(); - }), - }, - - trackingProtectionDisabled: { - applyConfig: Task.async(function* () { - let browserWindow = Services.wm.getMostRecentWindow("navigator:browser"); - let gBrowser = browserWindow.gBrowser; - Services.prefs.setBoolPref("privacy.trackingprotection.enabled", true); - yield UrlClassifierTestUtils.addTestTrackers(); - - yield loadPage(TRACKING_PAGE); - yield openIdentityPopup(); - // unblock the page - gBrowser.ownerGlobal.document.querySelector("#tracking-action-unblock").click(); - yield BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, TRACKING_PAGE); - yield openIdentityPopup(); - }), - }, }, }; @@ -46,7 +46,6 @@ endef endif endif - CWD := $(CURDIR) ifneq (1,$(words $(CWD))) $(error The platform directory cannot be located in a path with spaces.) @@ -64,11 +63,13 @@ TOPSRCDIR := $(CWD) endif endif +MOZILLA_DIR=$(TOPSRCDIR)/platform + SH := /bin/sh PERL ?= perl PYTHON ?= $(shell which python2.7 > /dev/null 2>&1 && echo python2.7 || echo python) -CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/platform/build/autoconf/config.guess) +CONFIG_GUESS_SCRIPT := $(wildcard $(MOZILLA_DIR)/build/autoconf/config.guess) ifdef CONFIG_GUESS_SCRIPT CONFIG_GUESS := $(shell $(CONFIG_GUESS_SCRIPT)) endif @@ -150,8 +151,8 @@ MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR) # 'configure' scripts generated by autoconf. CONFIGURES := $(TOPSRCDIR)/configure -CONFIGURES += $(TOPSRCDIR)/platform/configure -CONFIGURES += $(TOPSRCDIR)/platform/js/src/configure +CONFIGURES += $(MOZILLA_DIR)/configure +CONFIGURES += $(MOZILLA_DIR)/js/src/configure # Make targets that are going to be passed to the real build system OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check automation/build @@ -164,8 +165,8 @@ build:: $(MAKE) -f $(TOPSRCDIR)/client.mk $(if $(MOZ_PGO),profiledbuild,realbuild) CREATE_MOZCONFIG_JSON= # Define mkdir -include $(TOPSRCDIR)/config/makefiles/makeutils.mk -include $(TOPSRCDIR)/config/makefiles/autotargets.mk +include $(MOZILLA_DIR)/config/makefiles/makeutils.mk +include $(MOZILLA_DIR)/config/makefiles/autotargets.mk # Create a makefile containing the mk_add_options values from mozconfig, # but only do so when OBJDIR is defined (see further above). @@ -242,7 +243,7 @@ profiledbuild:: ifdef MOZ_UNIFY_BDATE ifndef MOZ_BUILD_DATE ifdef MOZ_BUILD_PROJECTS -MOZ_BUILD_DATE = $(shell $(PYTHON) $(TOPSRCDIR)/platform/build/variables.py buildid_header | awk '{print $$3}') +MOZ_BUILD_DATE = $(shell $(PYTHON) $(MOZILLA_DIR)/build/variables.py buildid_header | awk '{print $$3}') export MOZ_BUILD_DATE endif endif @@ -295,11 +296,11 @@ CONFIG_CACHE = $(wildcard $(OBJDIR)/config.cache) EXTRA_CONFIG_DEPS := \ $(TOPSRCDIR)/aclocal.m4 \ - $(TOPSRCDIR)/platform/aclocal.m4 \ - $(TOPSRCDIR)/platform/old-configure.in \ - $(wildcard $(TOPSRCDIR)/platform/build/autoconf/*.m4) \ - $(TOPSRCDIR)/platform/js/src/aclocal.m4 \ - $(TOPSRCDIR)/platform/js/src/old-configure.in \ + $(MOZILLA_DIR)/aclocal.m4 \ + $(MOZILLA_DIR)/old-configure.in \ + $(wildcard $(MOZILLA_DIR)/build/autoconf/*.m4) \ + $(MOZILLA_DIR)/js/src/aclocal.m4 \ + $(MOZILLA_DIR)/js/src/old-configure.in \ $(NULL) $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS) @@ -308,15 +309,15 @@ $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS) chmod +x $@ CONFIG_STATUS_DEPS := \ - $(wildcard $(TOPSRCDIR)/platform/ldap/sdks/c-sdk/configure) \ + $(wildcard $(MOZILLA_DIR)/ldap/sdks/c-sdk/configure) \ $(wildcard $(TOPSRCDIR)/*/confvars.sh) \ $(CONFIGURES) \ - $(TOPSRCDIR)/platform/CLOBBER \ - $(TOPSRCDIR)/platform/nsprpub/configure \ - $(TOPSRCDIR)/platform/config/milestone.txt \ - $(TOPSRCDIR)/platform/build/virtualenv_packages.txt \ - $(TOPSRCDIR)/platform/python/mozbuild/mozbuild/virtualenv.py \ - $(TOPSRCDIR)/platform/testing/mozbase/packages.txt \ + $(MOZILLA_DIR)/CLOBBER \ + $(MOZILLA_DIR)/nsprpub/configure \ + $(MOZILLA_DIR)/config/milestone.txt \ + $(MOZILLA_DIR)/build/virtualenv_packages.txt \ + $(MOZILLA_DIR)/python/mozbuild/mozbuild/virtualenv.py \ + $(MOZILLA_DIR)/testing/mozbase/packages.txt \ $(OBJDIR)/.mozconfig.json \ $(NULL) @@ -333,9 +334,9 @@ else CONFIGURE = $(TOPSRCDIR)/configure endif -$(OBJDIR)/CLOBBER: $(TOPSRCDIR)/platform/CLOBBER - $(PYTHON) $(TOPSRCDIR)/platform/config/pythonpath.py -I $(TOPSRCDIR)/platform/testing/mozbase/mozfile \ - $(TOPSRCDIR)/platform/python/mozbuild/mozbuild/controller/clobber.py $(TOPSRCDIR)/platform $(OBJDIR) +$(OBJDIR)/CLOBBER: $(MOZILLA_DIR)/CLOBBER + $(PYTHON) $(MOZILLA_DIR)/config/pythonpath.py -I $(MOZILLA_DIR)/testing/mozbase/mozfile \ + $(MOZILLA_DIR)/python/mozbuild/mozbuild/controller/clobber.py $(MOZILLA_DIR) $(OBJDIR) configure-files: $(CONFIGURES) diff --git a/config/makefiles/autotargets.mk b/config/makefiles/autotargets.mk deleted file mode 100644 index 16e06fb..0000000 --- a/config/makefiles/autotargets.mk +++ /dev/null @@ -1,94 +0,0 @@ -# -*- makefile -*- -# vim:set ts=8 sw=8 sts=8 noet: -# -# 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/. -# - -ifndef INCLUDED_AUTOTARGETS_MK #{ - -# Conditional does not wrap the entire file so multiple -# includes will be able to accumulate dependencies. - -########################################################################### -# AUTO_DEPS - A list of deps/targets drived from other macros. -########################################################################### - -MKDIR ?= mkdir -p -TOUCH ?= touch - -# declare for local use, rules.mk may not have been loaded -space = $(NULL) $(NULL) - -# Deps will be considered intermediate when used as a pre-requisite for -# wildcard targets. Inhibit their removal, mkdir -p is a standalone op. -.PRECIOUS: %/.mkdir.done - -######################### -##---] FUNCTIONS [---## -######################### - -# Squeeze can be overzealous, restore root for abspath -getPathPrefix =$(if $(filter /%,$(1)),/) - -# Squeeze '//' from the path, easily created by string functions -_slashSqueeze =$(foreach val,$(getargv),$(call getPathPrefix,$(val))$(subst $(space),/,$(strip $(subst /,$(space),$(val))))) - -# Squeeze extraneous directory slashes from the path -# o protect embedded spaces within the path -# o replace //+ sequences with / -slash_strip = \ - $(strip \ - $(subst <--[**]-->,$(space),\ - $(call _slashSqueeze,\ - $(subst $(space),<--[**]-->,$(1))\ - ))) - -# Extract directory path from a dependency file. -mkdir_stem =$(foreach val,$(getargv),$(subst /.mkdir.done,$(NULL),$(val))) - -## Generate timestamp file for threadsafe directory creation -mkdir_deps =$(foreach dir,$(getargv),$(call slash_strip,$(dir)/.mkdir.done)) - -####################### -##---] TARGETS [---## -####################### - -%/.mkdir.done: # mkdir -p -p => mkdir -p - $(subst $(space)-p,$(null),$(MKDIR)) -p '$(dir $@)' -# Make the timestamp old enough for not being a problem with symbolic links -# targets depending on it. Use Jan 3, 1980 to accomodate any timezone where -# 198001010000 would translate to something older than FAT epoch. - @$(TOUCH) -t 198001030000 '$@' - -# A handful of makefiles are attempting "mkdir dot". -# tbpl/valgrind builds are using this target -# https://bugzilla.mozilla.org/show_bug.cgi?id=837754 -.mkdir.done: - @echo 'WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)' - @$(TOUCH) -t 198001030000 '$@' - -INCLUDED_AUTOTARGETS_MK = 1 -endif #} - - -## Accumulate deps and cleanup -ifneq (,$(GENERATED_DIRS)) - GENERATED_DIRS := $(strip $(sort $(GENERATED_DIRS))) - tmpauto :=$(call mkdir_deps,GENERATED_DIRS) - GENERATED_DIRS_DEPS +=$(tmpauto) - GARBAGE_DIRS +=$(GENERATED_DIRS) -endif - -################################################################# -# One ring/dep to rule them all: -# config/rules.mk::all target is available by default -# Add $(AUTO_DEPS) as an explicit target dependency when needed. -################################################################# - -AUTO_DEPS +=$(GENERATED_DIRS_DEPS) -AUTO_DEPS := $(strip $(sort $(AUTO_DEPS))) - -# Complain loudly if deps have not loaded so getargv != $(NULL) -$(call requiredfunction,getargv) diff --git a/config/makefiles/makeutils.mk b/config/makefiles/makeutils.mk deleted file mode 100644 index d7c5c97..0000000 --- a/config/makefiles/makeutils.mk +++ /dev/null @@ -1,117 +0,0 @@ -# -*- makefile -*- -# vim:set ts=8 sw=8 sts=8 noet: -# -# 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/. - -## Identify function argument types -istype =$(if $(value ${1}),list,scalar) -isval =$(if $(filter-out list,$(call istype,${1})),true) -isvar =$(if $(filter-out scalar,$(call istype,${1})),true) - -# Access up to 9 arguments passed, option needed to emulate $* -# Inline for function expansion, do not use $(call ) -argv =$(strip -argv +=$(if $(1), $(1))$(if $(2), $(2))$(if $(3), $(3))$(if $(4), $(4)) -argv +=$(if $(5), $(5))$(if $(6), $(6))$(if $(7), $(7))$(if $(8), $(8)) -argv +=$(if $(9), $(9)) -argv +=$(if $(10), $(error makeutils.mk::argv can only handle 9 arguments)) -argv +=) - -########################################################################### -## Access function args as a simple list, inline within user functions. -## Usage: $(info ** $(call banner,$(getargv))) -## $(call banner,scalar) -## $(call banner,list0 list1 list2) -## $(call banner,ref) ; ref=foo bar tans -## getarglist() would be a more accurate name but is longer to type -getargv = $(if $(call isvar,$(1)),$($(1)),$(argv)) - -########################################################################### -# Strip [n] leading options from an argument list. This will allow passing -# extra args to user functions that will not propogate to sub-$(call )'s -# Usage: $(call subargv,2) -subargv =$(wordlist $(1),$(words $(getargv)),$(getargv)) - -########################################################################### -# Intent: Display a distinct banner heading in the output stream -# Usage: $(call banner,BUILDING: foo bar tans) -# Debug: -# target-preqs = \ -# $(call banner,target-preqs-BEGIN) \ -# foo bar tans \ -# $(call banner,target-preqs-END) \ -# $(NULL) -# target: $(target-preqs) - -banner = \ -$(info ) \ -$(info ***************************************************************************) \ -$(info ** $(getargv)) \ -$(info ***************************************************************************) \ -$(NULL) - -##################################################################### -# Intent: Determine if a string or pattern is contained in a list -# Usage: strcmp - $(call if_XinY,clean,$(MAKECMDGOALS)) -# : pattern - $(call if_XinY,clean%,$(MAKECMDGOALS)) -is_XinY =$(filter $(1),$(call subargv,3,$(getargv))) - -##################################################################### -# Provide an alternate var to support testing -ifdef MAKEUTILS_UNIT_TEST - mcg_goals=TEST_MAKECMDGOALS -else - mcg_goals=MAKECMDGOALS -endif - -# Intent: Conditionals for detecting common/tier target use -isTargetStem = $(sort \ - $(foreach var,$(getargv),\ - $(foreach pat,$(var)% %$(var),\ - $(call is_XinY,$(pat),${$(mcg_goals)})\ - ))) -isTargetStemClean = $(call isTargetStem,clean) -isTargetStemExport = $(call isTargetStem,export) -isTargetStemLibs = $(call isTargetStem,libs) -isTargetStemTools = $(call isTargetStem,tools) - -################################################## -# Intent: Validation functions / unit test helpers - -errorifneq =$(if $(subst $(strip $(1)),$(NULL),$(strip $(2))),$(error expected [$(1)] but found [$(2)])) - -# Intent: verify function declaration exists -requiredfunction =$(foreach func,$(1) $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9),$(if $(value $(func)),$(NULL),$(error required function [$(func)] is unavailable))) - - - -## http://www.gnu.org/software/make/manual/make.html#Call-Function -## Usage: o = $(call map,origin,o map $(MAKE)) -map = $(foreach val,$(2),$(call $(1),$(val))) - - -## Disable checking for clean targets -ifeq (,$(filter %clean clean%,$(MAKECMDGOALS))) #{ - -# Usage: $(call checkIfEmpty,[error|warning] foo NULL bar) -checkIfEmpty =$(foreach var,$(wordlist 2,100,$(argv)),$(if $(strip $($(var))),$(NOP),$(call $(1),Variable $(var) does not contain a value))) - -# Usage: $(call errorIfEmpty,foo NULL bar) -errorIfEmpty =$(call checkIfEmpty,error $(argv)) -warnIfEmpty =$(call checkIfEmpty,warning $(argv)) - -endif #} - -########################################################################### -## Common makefile library loader -########################################################################### -topORerr =$(if $(topsrcdir),$(topsrcdir),$(error topsrcdir is not defined)) - -ifdef USE_AUTOTARGETS_MK # mkdir_deps - include $(topORerr)/config/makefiles/autotargets.mk -endif - -## copy(src, dst): recursive copy -copy_dir = (cd $(1)/. && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(2)/. && tar -xf -) diff --git a/platform b/platform -Subproject 10851aa79b7b256e2720580ca7e5bcd8aa130c3 +Subproject a46ea601f7bb1f29d3856f607573be019876b45 |