summaryrefslogtreecommitdiffstats
path: root/application/basilisk/base/content
diff options
context:
space:
mode:
Diffstat (limited to 'application/basilisk/base/content')
-rw-r--r--application/basilisk/base/content/browser-context.inc3
-rw-r--r--application/basilisk/base/content/browser-sidebar.js6
-rw-r--r--application/basilisk/base/content/browser.js16
-rw-r--r--application/basilisk/base/content/nsContextMenu.js62
-rw-r--r--application/basilisk/base/content/tabbrowser.xml2
5 files changed, 0 insertions, 89 deletions
diff --git a/application/basilisk/base/content/browser-context.inc b/application/basilisk/base/content/browser-context.inc
index 9fa90b11c..36e0478af 100644
--- a/application/basilisk/base/content/browser-context.inc
+++ b/application/basilisk/base/content/browser-context.inc
@@ -3,9 +3,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/.
-# NB: IF YOU ADD ITEMS TO THIS FILE, PLEASE UPDATE THE WHITELIST IN
-# BrowserUITelemetry.jsm. SEE BUG 991757 FOR DETAILS.
-
<menugroup id="context-navigation">
<menuitem id="context-back"
class="menuitem-iconic"
diff --git a/application/basilisk/base/content/browser-sidebar.js b/application/basilisk/base/content/browser-sidebar.js
index 5893e6015..27517d162 100644
--- a/application/basilisk/base/content/browser-sidebar.js
+++ b/application/basilisk/base/content/browser-sidebar.js
@@ -194,10 +194,6 @@ var SidebarUI = {
return;
}
- if (this.isOpen && commandID != this.currentID) {
- BrowserUITelemetry.countSidebarEvent(this.currentID, "hide");
- }
-
let broadcasters = document.getElementsByAttribute("group", "sidebar");
for (let broadcaster of broadcasters) {
// skip elements that observe sidebar broadcasters and random
@@ -260,7 +256,6 @@ var SidebarUI = {
selBrowser.messageManager.sendAsyncMessage("Sidebar:VisibilityChange",
{commandID: commandID, isOpen: true}
);
- BrowserUITelemetry.countSidebarEvent(commandID, "show");
});
},
@@ -298,7 +293,6 @@ var SidebarUI = {
selBrowser.messageManager.sendAsyncMessage("Sidebar:VisibilityChange",
{commandID: commandID, isOpen: false}
);
- BrowserUITelemetry.countSidebarEvent(commandID, "hide");
},
};
diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js
index 64c0d86f5..38c340eea 100644
--- a/application/basilisk/base/content/browser.js
+++ b/application/basilisk/base/content/browser.js
@@ -16,7 +16,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"],
- ["BrowserUITelemetry", "resource:///modules/BrowserUITelemetry.jsm"],
["BrowserUsageTelemetry", "resource:///modules/BrowserUsageTelemetry.jsm"],
["BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"],
["CastingApps", "resource:///modules/CastingApps.jsm"],
@@ -3722,18 +3721,6 @@ const BrowserSearch = {
openUILinkIn(this.searchEnginesURL, where);
},
- _getSearchEngineId: function (engine) {
- if (engine && engine.identifier) {
- return engine.identifier;
- }
-
- if (!engine || (engine.name === undefined) ||
- !Services.prefs.getBoolPref("toolkit.telemetry.enabled"))
- return "other";
-
- return "other-" + engine.name;
- },
-
/**
* Helper to record a search with Telemetry.
*
@@ -3752,7 +3739,6 @@ const BrowserSearch = {
* selected it: {selection: {index: The selected index, kind: "key" or "mouse"}}
*/
recordSearchInTelemetry: function (engine, source, details={}) {
- BrowserUITelemetry.countSearchEvent(source, null, details.selection);
try {
BrowserUsageTelemetry.recordSearch(engine, source, details);
} catch (ex) {
@@ -3776,8 +3762,6 @@ const BrowserSearch = {
* (string) Where was the search link opened (e.g. new tab, current tab, ..).
*/
recordOneoffSearchInTelemetry: function (engine, source, type, where) {
- let id = this._getSearchEngineId(engine) + "." + source;
- BrowserUITelemetry.countOneoffSearchEvent(id, type, where);
try {
const details = {type, isOneOff: true};
BrowserUsageTelemetry.recordSearch(engine, source, details);
diff --git a/application/basilisk/base/content/nsContextMenu.js b/application/basilisk/base/content/nsContextMenu.js
index 589d670ab..3f77dcb90 100644
--- a/application/basilisk/base/content/nsContextMenu.js
+++ b/application/basilisk/base/content/nsContextMenu.js
@@ -85,9 +85,6 @@ nsContextMenu.prototype = {
// Initialize (disable/remove) menu items.
this.initItems();
-
- // Register this opening of the menu with telemetry:
- this._checkTelemetryForMenu(aXulMenu);
},
hiding: function CM_hiding() {
@@ -1782,65 +1779,6 @@ nsContextMenu.prototype = {
menuItem.label = menuLabel;
menuItem.accessKey = gNavigatorBundle.getString("contextMenuSearch.accesskey");
},
-
- _getTelemetryClickInfo: function(aXulMenu) {
- this._onPopupHiding = () => {
- aXulMenu.ownerDocument.removeEventListener("command", activationHandler, true);
- aXulMenu.removeEventListener("popuphiding", this._onPopupHiding, true);
- delete this._onPopupHiding;
-
- let eventKey = [
- this._telemetryPageContext,
- this._telemetryHadCustomItems ? "withcustom" : "withoutcustom"
- ];
- let target = this._telemetryClickID || "close-without-interaction";
- BrowserUITelemetry.registerContextMenuInteraction(eventKey, target);
- };
- let activationHandler = (e) => {
- // Deal with command events being routed to command elements; figure out
- // what triggered the event (which will have the right e.target)
- if (e.sourceEvent) {
- e = e.sourceEvent;
- }
- // Target should be in the menu (this catches using shortcuts for items
- // not in the menu while the menu is up)
- if (!aXulMenu.contains(e.target)) {
- return;
- }
-
- // Check if this is a page menu item:
- if (e.target.hasAttribute(PageMenuParent.GENERATEDITEMID_ATTR)) {
- this._telemetryClickID = "custom-page-item";
- } else {
- this._telemetryClickID = (e.target.id || "unknown").replace(/^context-/i, "");
- }
- };
- aXulMenu.ownerDocument.addEventListener("command", activationHandler, true);
- aXulMenu.addEventListener("popuphiding", this._onPopupHiding, true);
- },
-
- _getTelemetryPageContextInfo: function() {
- let rv = [];
- for (let k of ["isContentSelected", "onLink", "onImage", "onCanvas", "onVideo", "onAudio",
- "onTextInput"]) {
- if (this[k]) {
- rv.push(k.replace(/^(?:is|on)(.)/, (match, firstLetter) => firstLetter.toLowerCase()));
- }
- }
- if (!rv.length) {
- rv.push('other');
- }
-
- return JSON.stringify(rv);
- },
-
- _checkTelemetryForMenu: function(aXulMenu) {
- this._telemetryClickID = null;
- this._telemetryPageContext = this._getTelemetryPageContextInfo();
- this._telemetryHadCustomItems = this.hasPageMenu;
- this._getTelemetryClickInfo(aXulMenu);
- },
-
createContainerMenu: function(aEvent) {
return createUserContextMenu(aEvent, true,
gContextMenuContentData.userContextId);
diff --git a/application/basilisk/base/content/tabbrowser.xml b/application/basilisk/base/content/tabbrowser.xml
index 463e74a52..f8dbcf364 100644
--- a/application/basilisk/base/content/tabbrowser.xml
+++ b/application/basilisk/base/content/tabbrowser.xml
@@ -6878,11 +6878,9 @@
if (browser.audioMuted) {
browser.unmute();
this.removeAttribute("muted");
- BrowserUITelemetry.countTabMutingEvent("unmute", aMuteReason);
} else {
browser.mute();
this.setAttribute("muted", "true");
- BrowserUITelemetry.countTabMutingEvent("mute", aMuteReason);
}
this.muteReason = aMuteReason || null;
modifiedAttrs.push("muted");