diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul
index 1befa2bb66cc..da74ca077c0c 100644
--- a/browser/base/content/baseMenuOverlay.xul
+++ b/browser/base/content/baseMenuOverlay.xul
@@ -22,7 +22,7 @@
used as they only apply to Cocoa widget builds. All version of Firefox
through Firefox 2 will use Carbon widgets. -->
@@ -532,7 +532,7 @@
+ oncommand="openPreferences();"/>
#endif
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 2a7c63c405f6..01b5bdae2c14 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -93,7 +93,7 @@
-
+
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index f0bbfa799134..2c50c99f8529 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -241,17 +241,17 @@ var gSync = {
onMenuPanelCommand() {
switch (this.panelUIFooter.getAttribute("fxastatus")) {
case "signedin":
- this.openPrefs("menupanel", "fxaSignedin");
+ this.openPrefs("menupanel");
break;
case "error":
if (this.panelUIFooter.getAttribute("fxastatus") == "unverified") {
- this.openPrefs("menupanel", "fxaError");
+ this.openPrefs("menupanel");
} else {
this.openSignInAgainPage("menupanel");
}
break;
default:
- this.openPrefs("menupanel", "fxa");
+ this.openPrefs("menupanel");
break;
}
@@ -439,8 +439,8 @@ var gSync = {
Services.obs.notifyObservers(null, "cloudsync:user-sync");
},
- openPrefs(entryPoint = "syncbutton", origin = undefined) {
- window.openPreferences("paneSync", { origin, urlParams: { entrypoint: entryPoint } });
+ openPrefs(entryPoint = "syncbutton") {
+ window.openPreferences("paneSync", { urlParams: { entrypoint: entryPoint } });
},
openSyncedTabsPanel() {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9e2829e9b6ca..ab5596e757fd 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -527,9 +527,9 @@ const gStoragePressureObserver = {
// be removed by bug 1349689.
let win = gBrowser.ownerGlobal;
if (Preferences.get("browser.preferences.useOldOrganization", false)) {
- win.openAdvancedPreferences("networkTab", {origin: "storagePressure"});
+ win.openAdvancedPreferences("networkTab");
} else {
- win.openPreferences("panePrivacy", {origin: "storagePressure"});
+ win.openPreferences("panePrivacy");
}
}
});
@@ -6371,9 +6371,9 @@ var OfflineApps = {
// The advanced subpanes are only supported in the old organization, which will
// be removed by bug 1349689.
if (Preferences.get("browser.preferences.useOldOrganization", false)) {
- openAdvancedPreferences("networkTab", {origin: "offlineApps"});
+ openAdvancedPreferences("networkTab");
} else {
- openPreferences("panePrivacy", {origin: "offlineApps"});
+ openPreferences("panePrivacy");
}
},
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index a05ebbf32b9b..4e014bb71557 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -715,12 +715,6 @@ function openAboutDialog() {
}
function openPreferences(paneID, extraArgs) {
- let histogram = Services.telemetry.getHistogramById("FX_PREFERENCES_OPENED_VIA");
- if (extraArgs && extraArgs.origin) {
- histogram.add(extraArgs.origin);
- } else {
- histogram.add("other");
- }
function switchToAdvancedSubPane(doc) {
if (extraArgs && extraArgs["advancedTab"]) {
let advancedPaneTabs = doc.getElementById("advancedPrefs");
@@ -786,8 +780,8 @@ function openPreferences(paneID, extraArgs) {
}
}
-function openAdvancedPreferences(tabID, origin) {
- openPreferences("paneAdvanced", { "advancedTab": tabID, origin });
+function openAdvancedPreferences(tabID) {
+ openPreferences("paneAdvanced", { "advancedTab": tabID });
}
/**
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
index 471ed9a93392..a8e0ed1919a5 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -1153,7 +1153,7 @@ let preferencesButton = {
defaultArea: CustomizableUI.AREA_PANEL,
onCommand(aEvent) {
let win = aEvent.target.ownerGlobal;
- win.openPreferences(undefined, {origin: "preferencesButton"});
+ win.openPreferences();
}
};
if (AppConstants.platform == "win") {
diff --git a/browser/components/newtab/NewTabSearchProvider.jsm b/browser/components/newtab/NewTabSearchProvider.jsm
index 1fa4f253498e..0a5eb1c6257b 100644
--- a/browser/components/newtab/NewTabSearchProvider.jsm
+++ b/browser/components/newtab/NewTabSearchProvider.jsm
@@ -72,7 +72,7 @@ SearchProvider.prototype = {
manageEngines(browser) {
const browserWin = browser.ownerGlobal;
- browserWin.openPreferences("paneGeneral", { origin: "contentSearch" });
+ browserWin.openPreferences("paneGeneral");
},
asyncGetState: Task.async(function*() {
diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index 408f6bc3909f..a72b63635956 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -215,12 +215,7 @@ function openWindow(parent, url, target, features, args, noExternalArgs) {
return Services.ww.openWindow(parent, url, target, features, argArray);
}
-function openPreferences(extraArgs) {
- if (extraArgs && extraArgs.origin) {
- Services.telemetry.getHistogramById("FX_PREFERENCES_OPENED_VIA").add(extraArgs.origin);
- } else {
- Services.telemetry.getHistogramById("FX_PREFERENCES_OPENED_VIA").add("other");
- }
+function openPreferences() {
var args = Components.classes["@mozilla.org/array;1"]
.createInstance(Components.interfaces.nsIMutableArray);
@@ -356,7 +351,7 @@ nsBrowserContentHandler.prototype = {
// Handle old preference dialog URLs.
if (chromeParam == "chrome://browser/content/pref/pref.xul" ||
chromeParam == "chrome://browser/content/preferences/preferences.xul") {
- openPreferences({origin: "commandLineLegacy"});
+ openPreferences();
cmdLine.preventDefault = true;
} else try {
let resolvedURI = resolveURIInternal(cmdLine, chromeParam);
@@ -381,7 +376,7 @@ nsBrowserContentHandler.prototype = {
}
}
if (cmdLine.handleFlag("preferences", false)) {
- openPreferences({origin: "commandLineLegacy"});
+ openPreferences();
cmdLine.preventDefault = true;
}
if (cmdLine.handleFlag("silent", false))
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index fd9c0b652033..c98649d6d27d 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -303,7 +303,7 @@ BrowserGlue.prototype = {
observe: function BG_observe(subject, topic, data) {
switch (topic) {
case "notifications-open-settings":
- this._openPreferences("privacy", { origin: "notifOpenSettings" });
+ this._openPreferences("privacy");
break;
case "prefservice:after-app-defaults":
this._onAppDefaults();
@@ -1661,7 +1661,7 @@ BrowserGlue.prototype = {
let clickCallback = (subject, topic, data) => {
if (topic != "alertclickcallback")
return;
- this._openPreferences("sync", { origin: "doorhanger" });
+ this._openPreferences("sync");
}
AlertsService.showAlertNotification(null, title, body, true, null, clickCallback);
},
@@ -2244,7 +2244,7 @@ BrowserGlue.prototype = {
let clickCallback = (subject, topic, data) => {
if (topic != "alertclickcallback")
return;
- this._openPreferences("sync", { origin: "devDisconnectedAlert"});
+ this._openPreferences("sync");
}
AlertsService.showAlertNotification(null, title, body, true, null, clickCallback);
},
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index c236796c53eb..419a7810c9d2 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -1460,7 +1460,7 @@
-