diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2018-05-25 06:53:37 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2018-05-31 14:23:57 -0400 |
| commit | b109b14de63500ab07c478723d4851b345139bdd (patch) | |
| tree | edc42d81a61a0f91b8ee69178c4be8373ea33473 /browser/modules | |
| parent | 3ab978b4a4df6548a7b1c490c8a3754476b16054 (diff) | |
| download | UXP-b109b14de63500ab07c478723d4851b345139bdd.tar UXP-b109b14de63500ab07c478723d4851b345139bdd.tar.gz UXP-b109b14de63500ab07c478723d4851b345139bdd.tar.lz UXP-b109b14de63500ab07c478723d4851b345139bdd.tar.xz UXP-b109b14de63500ab07c478723d4851b345139bdd.zip | |
Remove UITour and customize tips.
Diffstat (limited to 'browser/modules')
| -rw-r--r-- | browser/modules/BrowserUITelemetry.jsm | 7 | ||||
| -rw-r--r-- | browser/modules/SelfSupportBackend.jsm | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/browser/modules/BrowserUITelemetry.jsm b/browser/modules/BrowserUITelemetry.jsm index 2ad319f1a..2b7cc8c20 100644 --- a/browser/modules/BrowserUITelemetry.jsm +++ b/browser/modules/BrowserUITelemetry.jsm @@ -17,8 +17,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow", "resource:///modules/RecentWindow.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "UITour", - "resource:///modules/UITour.jsm"); XPCOMUtils.defineLazyGetter(this, "Timer", function() { let timer = {}; Cu.import("resource://gre/modules/Timer.jsm", timer); @@ -174,11 +172,6 @@ this.BrowserUITelemetry = { this.getToolbarMeasures.bind(this)); UITelemetry.addSimpleMeasureFunction("contextmenu", this.getContextMenuInfo.bind(this)); - // Ensure that UITour.jsm remains lazy-loaded, yet always registers its - // simple measure function with UITelemetry. - UITelemetry.addSimpleMeasureFunction("UITour", - () => UITour.getTelemetry()); - UITelemetry.addSimpleMeasureFunction("syncstate", this.getSyncState.bind(this)); diff --git a/browser/modules/SelfSupportBackend.jsm b/browser/modules/SelfSupportBackend.jsm index 3a3f8cb8b..961a2af0a 100644 --- a/browser/modules/SelfSupportBackend.jsm +++ b/browser/modules/SelfSupportBackend.jsm @@ -25,8 +25,6 @@ const PREF_ENABLED = "browser.selfsupport.enabled"; const PREF_URL = "browser.selfsupport.url"; // Unified Telemetry status. const PREF_TELEMETRY_UNIFIED = "toolkit.telemetry.unified"; -// UITour status. -const PREF_UITOUR_ENABLED = "browser.uitour.enabled"; // Controls the interval at which the self support page tries to reload in case of // errors. @@ -44,8 +42,6 @@ const PREF_LOG_DUMP = PREF_BRANCH_LOG + "dump"; const HTML_NS = "http://www.w3.org/1999/xhtml"; const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -const UITOUR_FRAME_SCRIPT = "chrome://browser/content/content-UITour.js"; - // Whether the FHR/Telemetry unification features are enabled. // Changing this pref requires a restart. const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_TELEMETRY_UNIFIED, false); @@ -90,8 +86,7 @@ var SelfSupportBackendInternal = { } // Make sure UITour is enabled. - let uiTourEnabled = Preferences.get(PREF_UITOUR_ENABLED, false); - if (!uiTourEnabled) { + if (true) { this._log.config("init - Disabling SelfSupport because UITour is disabled."); return; } @@ -253,9 +248,6 @@ var SelfSupportBackendInternal = { // Create the hidden browser. this._makeHiddenBrowser(url).then(() => { - // Load UITour frame script. - this._browser.messageManager.loadFrameScript(UITOUR_FRAME_SCRIPT, true); - // We need to watch for load errors as well and, in case, try to reload // the self support page. const webFlags = Ci.nsIWebProgress.NOTIFY_STATE_WINDOW | |