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

application/basilisk/components/customizableui/moz.build

@@ -8,13 +8,10 @@ DIRS += [
 ]
 
 EXTRA_JS_MODULES += [
+    'CustomizableUI.jsm',
     'CustomizableWidgets.jsm',
     'CustomizeMode.jsm',
     'DragPositionManager.jsm',
     'PanelWideWidgetTracker.jsm',
     'ScrollbarSampler.jsm',
 ]
-
-EXTRA_PP_JS_MODULES += [
-    'CustomizableUI.jsm',
-]

application/basilisk/components/preferences/in-content/advanced.js

@@ -208,30 +208,6 @@ var gAdvancedPane = {
 
   // DATA CHOICES TAB
 
-  /**
-   * Set up or hide the Learn More links for various data collection options
-   */
-  _setupLearnMoreLink: function (pref, element) {
-    // set up the Learn More link with the correct URL
-    let url = Services.prefs.getCharPref(pref);
-    let el = document.getElementById(element);
-
-    if (url) {
-      el.setAttribute("href", url);
-    } else {
-      el.setAttribute("hidden", "true");
-    }
-  },
-
-  /**
-   *
-   */
-  initSubmitCrashes: function ()
-  {
-    this._setupLearnMoreLink("toolkit.crashreporter.infoURL",
-                             "crashReporterLearnMore");
-  },
-
   /**
    * Initialize the health report service reference and checkbox.
    */

application/basilisk/components/preferences/in-content/jar.mn

@@ -8,7 +8,7 @@ browser.jar:
    content/browser/preferences/in-content/subdialogs.js
 
    content/browser/preferences/in-content/main.js
-*  content/browser/preferences/in-content/privacy.js
+   content/browser/preferences/in-content/privacy.js
    content/browser/preferences/in-content/containers.js
    content/browser/preferences/in-content/advanced.js
    content/browser/preferences/in-content/applications.js
@@ -16,5 +16,5 @@ browser.jar:
 #ifdef MOZ_SERVICES_SYNC
    content/browser/preferences/in-content/sync.js
 #endif
-*  content/browser/preferences/in-content/security.js
+   content/browser/preferences/in-content/security.js
    content/browser/preferences/in-content/search.js

application/basilisk/components/preferences/in-content/main.js

@@ -84,11 +84,6 @@ var gMainPane = {
               .notifyObservers(window, "main-pane-loaded", null);
   },
 
-  enableE10SChange: function ()
-  {
-    // **STUB**
-  },
-
   // HOME PAGE
 
   /*

application/basilisk/components/privatebrowsing/jar.mn

@@ -4,5 +4,5 @@
 
 browser.jar:
     content/browser/aboutPrivateBrowsing.css              (content/aboutPrivateBrowsing.css)
-*   content/browser/aboutPrivateBrowsing.xhtml            (content/aboutPrivateBrowsing.xhtml)
-*   content/browser/aboutPrivateBrowsing.js               (content/aboutPrivateBrowsing.js)
+    content/browser/aboutPrivateBrowsing.xhtml            (content/aboutPrivateBrowsing.xhtml)
+    content/browser/aboutPrivateBrowsing.js               (content/aboutPrivateBrowsing.js)

application/basilisk/components/search/content/search.xml

@@ -1832,7 +1832,6 @@
           return false;
         ]]></body>
       </method>
-
     </implementation>
 
     <handlers>

application/basilisk/components/search/service/moz.build

@@ -8,12 +8,12 @@ DIST_SUBDIR = ''
 DEFINES['HAVE_SIDEBAR'] = True
 
 EXTRA_COMPONENTS += [
+    'nsSearchService.js',
     'nsSearchSuggestions.js',
     'nsSidebar.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
-    'nsSearchService.js',
     'toolkitsearch.manifest',
 ]
 

application/basilisk/components/sessionstore/SessionStore.jsm

@@ -908,7 +908,6 @@ var SessionStoreInternal = {
         this._crashedBrowsers.delete(browser.permanentKey);
         break;
       case "SessionStore:error":
-        this.reportInternalError(data);
         TabStateFlusher.resolveAll(browser, false, "Received error from the content process");
         break;
       default:
@@ -4439,13 +4438,6 @@ var SessionStoreInternal = {
     this._browserEpochs.delete(browser.permanentKey);
   },
 
-  /**
-   * Handle an error report from a content process.
-   */
-  reportInternalError(data) {
-    // STUB, was only reported through Telemetry.
-  },
-
   /**
    * Countdown for a given duration, skipping beats if the computer is too busy,
    * sleeping or otherwise unavailable.

application/basilisk/components/sessionstore/content/aboutSessionRestore.js

@@ -8,8 +8,6 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
-  "resource://gre/modules/AppConstants.jsm");
 
 var gStateObject;
 var gTreeData;
@@ -195,9 +193,11 @@ function onListClick(aEvent) {
   if (cell.col) {
     // Restore this specific tab in the same window for middle/double/accel clicking
     // on a tab's title.
-    let accelKey = AppConstants.platform == "macosx" ?
-                   aEvent.metaKey :
-                   aEvent.ctrlKey;
+#ifdef XP_MACOSX
+    let accelKey = aEvent.metaKey;
+#else
+    let accelKey = aEvent.ctrlKey;
+#endif
     if ((aEvent.button == 1 || aEvent.button == 0 && aEvent.detail == 2 || accelKey) &&
         cell.col.id == "title" &&
         !treeView.isContainer(cell.row)) {

application/basilisk/components/sessionstore/jar.mn

@@ -4,5 +4,5 @@
 
 browser.jar:
 *   content/browser/aboutSessionRestore.xhtml             (content/aboutSessionRestore.xhtml)
-    content/browser/aboutSessionRestore.js                (content/aboutSessionRestore.js)
+*   content/browser/aboutSessionRestore.js                (content/aboutSessionRestore.js)
     content/browser/content-sessionStore.js               (content/content-sessionStore.js)