Skip to content

Commit

Permalink
#334: remove telemetry from customizeableui
Browse files Browse the repository at this point in the history
  • Loading branch information
classilla committed Sep 2, 2017
1 parent 6aee6c0 commit bbe74e8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
4 changes: 3 additions & 1 deletion browser/components/customizableui/CustomizableWidgets.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ this.EXPORTED_SYMBOLS = ["CustomizableWidgets"];
Cu.import("resource:///modules/CustomizableUI.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
/*
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
"resource:///modules/BrowserUITelemetry.jsm");
*/
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesUIUtils",
Expand Down Expand Up @@ -1180,7 +1182,7 @@ if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
this._ensureSanitizer();
this._sanitizer.range = this._getSanitizeRange(doc);
let group = doc.getElementById("PanelUI-panic-timeSpan");
BrowserUITelemetry.countPanicEvent(group.selectedItem.id);
//BrowserUITelemetry.countPanicEvent(group.selectedItem.id);
group.selectedItem = doc.getElementById("PanelUI-panic-5min");
let itemsToClear = [
"cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads"
Expand Down
16 changes: 9 additions & 7 deletions browser/components/customizableui/CustomizeMode.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ Cu.import("resource://gre/modules/AddonManager.jsm");

XPCOMUtils.defineLazyModuleGetter(this, "DragPositionManager",
"resource:///modules/DragPositionManager.jsm");
/*
XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
"resource:///modules/BrowserUITelemetry.jsm");
*/
XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
"resource://gre/modules/LightweightThemeManager.jsm");

Expand Down Expand Up @@ -1117,7 +1119,7 @@ CustomizeMode.prototype = {
this.resetting = true;
// Disable the reset button temporarily while resetting:
let btn = this.document.getElementById("customization-reset-button");
BrowserUITelemetry.countCustomizationEvent("reset");
//BrowserUITelemetry.countCustomizationEvent("reset");
btn.disabled = true;
return Task.spawn(function() {
this._removePanelCustomizationPlaceholders();
Expand Down Expand Up @@ -1750,7 +1752,7 @@ CustomizeMode.prototype = {
}

CustomizableUI.removeWidgetFromArea(aDraggedItemId);
BrowserUITelemetry.countCustomizationEvent("remove");
//BrowserUITelemetry.countCustomizationEvent("remove");
// Special widgets are removed outright, we can return here:
if (CustomizableUI.isSpecialWidget(aDraggedItemId)) {
return;
Expand Down Expand Up @@ -1792,7 +1794,7 @@ CustomizeMode.prototype = {
this.wrapToolbarItem(aTargetNode, place);
}
this.wrapToolbarItem(draggedItem, place);
BrowserUITelemetry.countCustomizationEvent("move");
//BrowserUITelemetry.countCustomizationEvent("move");
return;
}

Expand All @@ -1804,8 +1806,8 @@ CustomizeMode.prototype = {
// within the same area, and adding a widget from one area to another area
// as a "move". An "add" is only when we move an item from the palette into
// an area.
let custEventType = aOriginArea.id == kPaletteId ? "add" : "move";
BrowserUITelemetry.countCustomizationEvent(custEventType);
//let custEventType = aOriginArea.id == kPaletteId ? "add" : "move";
//BrowserUITelemetry.countCustomizationEvent(custEventType);
this._onDragEnd(aEvent);
return;
}
Expand Down Expand Up @@ -1847,8 +1849,8 @@ CustomizeMode.prototype = {

// For BrowserUITelemetry, an "add" is only when we move an item from the palette
// into an area. Otherwise, it's a move.
let custEventType = aOriginArea.id == kPaletteId ? "add" : "move";
BrowserUITelemetry.countCustomizationEvent(custEventType);
//let custEventType = aOriginArea.id == kPaletteId ? "add" : "move";
//BrowserUITelemetry.countCustomizationEvent(custEventType);

// If we dropped onto a skipintoolbarset item, manually correct the drop location:
if (aTargetNode != itemForPlacement) {
Expand Down

0 comments on commit bbe74e8

Please sign in to comment.