Merge remote-tracking branch 'origin/tracking' into custom

application/basilisk/base/content/aboutDialog.js

@@ -6,7 +6,6 @@
 
 // Services = object with smart getters for common XPCOM services
 Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AppConstants.jsm");
 
 function init(aEvent)
 {
@@ -69,23 +68,29 @@ function init(aEvent)
   let arch = bundle.GetStringFromName(archResource);
   versionField.textContent += ` (${arch})`;
 
+#ifdef MOZ_WIDGET_GTK
+  // If Linux append the toolkit "(GTK2)" or "(GTK3)"
+  let toolkit = Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULRuntime).widgetToolkit.toUpperCase();
+  versionField.textContent += ` (${toolkit})`;
+#endif
+
   // Get Release Notes URL from Preferences
   let releaseNotesURL = Services.prefs.getCharPref("app.releaseNotesURL");
   document.getElementById("releasenotes").setAttribute("href", releaseNotesURL);
 
-  if (AppConstants.MOZ_UPDATER) {
-    gAppUpdater = new appUpdater();
+#ifdef MOZ_UPDATER
+  gAppUpdater = new appUpdater();
 
-    let channelLabel = document.getElementById("currentChannel");
-    let currentChannelText = document.getElementById("currentChannelText");
-    channelLabel.value = UpdateUtils.UpdateChannel;
-    if (/^release($|\-)/.test(channelLabel.value))
-        currentChannelText.hidden = true;
-  }
+  let channelLabel = document.getElementById("currentChannel");
+  let currentChannelText = document.getElementById("currentChannelText");
+  channelLabel.value = UpdateUtils.UpdateChannel;
+  if (/^release($|\-)/.test(channelLabel.value))
+      currentChannelText.hidden = true;
+#endif
 
-  if (AppConstants.platform == "macosx") {
-    // it may not be sized at this point, and we need its width to calculate its position
-    window.sizeToContent();
-    window.moveTo((screen.availWidth / 2) - (window.outerWidth / 2), screen.availHeight / 5);
-  }
+#ifdef XP_MACOSX
+  // it may not be sized at this point, and we need its width to calculate its position
+  window.sizeToContent();
+  window.moveTo((screen.availWidth / 2) - (window.outerWidth / 2), screen.availHeight / 5);
+#endif
 }

application/basilisk/base/content/browser-plugins.js

@@ -13,7 +13,6 @@ var gPluginHandler = {
     "PluginContent:HideNotificationBar",
     "PluginContent:InstallSinglePlugin",
     "PluginContent:ShowPluginCrashedNotification",
-    "PluginContent:SubmitReport",
     "PluginContent:LinkClickCallback",
   ],
 
@@ -62,9 +61,6 @@ var gPluginHandler = {
         this.showPluginCrashedNotification(msg.target, msg.data.messageString,
                                            msg.data.pluginID);
         break;
-      case "PluginContent:SubmitReport":
-        // Nothing to do here
-        break;
       case "PluginContent:LinkClickCallback":
         switch (msg.data.name) {
           case "managePlugins":
@@ -95,11 +91,6 @@ var gPluginHandler = {
     openUILinkIn(url, "tab");
   },
 
-  submitReport: function(runID, keyVals, submitURLOptIn) {
-    /*** STUB ***/
-    return;
-  },
-
   // Callback for user clicking a "reload page" link
   reloadPage: function (browser) {
     browser.reload();

application/basilisk/base/content/docs/sslerrorreport/preferences.rst

@@ -1,23 +0,0 @@
-.. _healthreport_preferences:
-
-===========
-Preferences
-===========
-
-The following preferences are used by SSL Error reporting:
-
-"security.ssl.errorReporting.enabled"
-  Should the SSL Error Reporting UI be shown on pin violations? Default
-  value: ``true``
-
-"security.ssl.errorReporting.url"
-  Where should SSL error reports be sent? Default value:
-  ``https://incoming.telemetry.mozilla.org/submit/sslreports/``
-
-"security.ssl.errorReporting.automatic"
-  Should error reports be sent without user interaction. Default value:
-  ``false``. Note: this pref is overridden by the value of
-  ``security.ssl.errorReporting.enabled``
-  This is only set when specifically requested by the user. The user can set
-  this value (or unset it) by checking the "Automatically report errors in the
-  future" checkbox when about:neterror is displayed for SSL Errors.

application/basilisk/base/content/tabbrowser.xml

@@ -4123,7 +4123,7 @@
             },
 
             /*
-             * Telemetry and Profiler related helpers for recording tab switch
+             * Profiler related helpers for recording tab switch
              * timing.
              */