Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 193 insertions, 0 deletions

diff --git a/application/basilisk/base/jar.mn b/application/basilisk/base/jar.mn
new file mode 100644
index 000000000..5ec92d79a
--- /dev/null
+++ b/application/basilisk/base/jar.mn
@@ -0,0 +1,193 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+browser.jar:
+%  content browser %content/browser/ contentaccessible=yes
+#ifdef XP_MACOSX
+%  overlay chrome://mozapps/content/downloads/downloads.xul chrome://browser/content/downloadManagerOverlay.xul
+%  overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
+%  overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul
+#endif
+%  overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
+%  overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
+
+        content/browser/aboutDialog-appUpdater.js     (content/aboutDialog-appUpdater.js)
+*       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
+        content/browser/aboutDialog.js                (content/aboutDialog.js)
+        content/browser/aboutDialog.css               (content/aboutDialog.css)
+        content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
+*       content/browser/abouthome/aboutHome.xhtml     (content/abouthome/aboutHome.xhtml)
+        content/browser/abouthome/aboutHome.js        (content/abouthome/aboutHome.js)
+*       content/browser/abouthome/aboutHome.css       (content/abouthome/aboutHome.css)
+        content/browser/abouthome/snippet1.png        (content/abouthome/snippet1.png)
+        content/browser/abouthome/snippet2.png        (content/abouthome/snippet2.png)
+        content/browser/abouthome/downloads.png       (content/abouthome/downloads.png)
+        content/browser/abouthome/bookmarks.png       (content/abouthome/bookmarks.png)
+        content/browser/abouthome/history.png         (content/abouthome/history.png)
+        content/browser/abouthome/addons.png          (content/abouthome/addons.png)
+        content/browser/abouthome/sync.png            (content/abouthome/sync.png)
+        content/browser/abouthome/settings.png        (content/abouthome/settings.png)
+        content/browser/abouthome/restore.png         (content/abouthome/restore.png)
+        content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
+        content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
+        content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
+        content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
+        content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
+        content/browser/abouthome/bookmarks@2x.png     (content/abouthome/bookmarks@2x.png)
+        content/browser/abouthome/history@2x.png       (content/abouthome/history@2x.png)
+        content/browser/abouthome/addons@2x.png        (content/abouthome/addons@2x.png)
+        content/browser/abouthome/sync@2x.png          (content/abouthome/sync@2x.png)
+        content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
+        content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
+        content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
+        content/browser/abouthome/mozilla@2x.png       (content/abouthome/mozilla@2x.png)
+
+        content/browser/aboutNetError.xhtml            (content/aboutNetError.xhtml)
+
+#ifdef MOZ_SERVICES_HEALTHREPORT
+        content/browser/abouthealthreport/abouthealth.xhtml   (content/abouthealthreport/abouthealth.xhtml)
+        content/browser/abouthealthreport/abouthealth.js      (content/abouthealthreport/abouthealth.js)
+        content/browser/abouthealthreport/abouthealth.css     (content/abouthealthreport/abouthealth.css)
+#endif
+        content/browser/aboutaccounts/aboutaccounts.xhtml                     (content/aboutaccounts/aboutaccounts.xhtml)
+        content/browser/aboutaccounts/aboutaccounts.js                        (content/aboutaccounts/aboutaccounts.js)
+        content/browser/aboutaccounts/aboutaccounts.css                       (content/aboutaccounts/aboutaccounts.css)
+        content/browser/aboutaccounts/main.css                                (content/aboutaccounts/main.css)
+        content/browser/aboutaccounts/normalize.css                           (content/aboutaccounts/normalize.css)
+        content/browser/aboutaccounts/images/fox.png                          (content/aboutaccounts/images/fox.png)
+        content/browser/aboutaccounts/images/graphic_sync_intro.png           (content/aboutaccounts/images/graphic_sync_intro.png)
+        content/browser/aboutaccounts/images/graphic_sync_intro@2x.png        (content/aboutaccounts/images/graphic_sync_intro@2x.png)
+
+
+        content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
+        content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+        content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
+        content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
+        content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
+*       content/browser/browser.css                   (content/browser.css)
+*       content/browser/browser.js                    (content/browser.js)
+*       content/browser/browser.xul                   (content/browser.xul)
+        content/browser/browser-addons.js             (content/browser-addons.js)
+        content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
+        content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
+        content/browser/browser-customization.js      (content/browser-customization.js)
+        content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
+        content/browser/browser-devedition.js         (content/browser-devedition.js)
+        content/browser/browser-feeds.js              (content/browser-feeds.js)
+        content/browser/browser-fullScreenAndPointerLock.js  (content/browser-fullScreenAndPointerLock.js)
+        content/browser/browser-fullZoom.js           (content/browser-fullZoom.js)
+        content/browser/browser-fxaccounts.js         (content/browser-fxaccounts.js)
+        content/browser/browser-gestureSupport.js     (content/browser-gestureSupport.js)
+*       content/browser/browser-media.js              (content/browser-media.js)
+        content/browser/browser-places.js             (content/browser-places.js)
+        content/browser/browser-plugins.js            (content/browser-plugins.js)
+        content/browser/browser-refreshblocker.js     (content/browser-refreshblocker.js)
+#ifdef MOZ_SAFE_BROWSING
+        content/browser/browser-safebrowsing.js       (content/browser-safebrowsing.js)
+#endif
+        content/browser/browser-sidebar.js            (content/browser-sidebar.js)
+*       content/browser/browser-syncui.js             (content/browser-syncui.js)
+*       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
+#ifdef CAN_DRAW_IN_TITLEBAR
+        content/browser/browser-tabsintitlebar.js       (content/browser-tabsintitlebar.js)
+#else
+        content/browser/browser-tabsintitlebar.js       (content/browser-tabsintitlebar-stub.js)
+#endif
+        content/browser/browser-thumbnails.js         (content/browser-thumbnails.js)
+        content/browser/browser-trackingprotection.js (content/browser-trackingprotection.js)
+*       content/browser/tab-content.js                (content/tab-content.js)
+        content/browser/content.js                    (content/content.js)
+        content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
+        content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
+        content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
+        content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
+        content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
+        content/browser/defaultthemes/2.header.jpg    (content/defaultthemes/2.header.jpg)
+        content/browser/defaultthemes/2.icon.jpg      (content/defaultthemes/2.icon.jpg)
+        content/browser/defaultthemes/2.preview.jpg   (content/defaultthemes/2.preview.jpg)
+        content/browser/defaultthemes/3.footer.png    (content/defaultthemes/3.footer.png)
+        content/browser/defaultthemes/3.header.png    (content/defaultthemes/3.header.png)
+        content/browser/defaultthemes/3.icon.png      (content/defaultthemes/3.icon.png)
+        content/browser/defaultthemes/3.preview.png   (content/defaultthemes/3.preview.png)
+        content/browser/defaultthemes/4.footer.png    (content/defaultthemes/4.footer.png)
+        content/browser/defaultthemes/4.header.png    (content/defaultthemes/4.header.png)
+        content/browser/defaultthemes/4.icon.png      (content/defaultthemes/4.icon.png)
+        content/browser/defaultthemes/4.preview.png   (content/defaultthemes/4.preview.png)
+        content/browser/defaultthemes/5.footer.png    (content/defaultthemes/5.footer.png)
+        content/browser/defaultthemes/5.header.png    (content/defaultthemes/5.header.png)
+        content/browser/defaultthemes/5.icon.jpg      (content/defaultthemes/5.icon.jpg)
+        content/browser/defaultthemes/5.preview.jpg   (content/defaultthemes/5.preview.jpg)
+        content/browser/defaultthemes/devedition.header.png   (content/defaultthemes/devedition.header.png)
+        content/browser/defaultthemes/devedition.icon.png     (content/defaultthemes/devedition.icon.png)
+        content/browser/gcli_sec_bad.svg              (content/gcli_sec_bad.svg)
+        content/browser/gcli_sec_good.svg             (content/gcli_sec_good.svg)
+        content/browser/gcli_sec_moderate.svg         (content/gcli_sec_moderate.svg)
+        content/browser/newtab/newTab.xhtml           (content/newtab/newTab.xhtml)
+*       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
+        content/browser/newtab/newTab.css             (content/newtab/newTab.css)
+        content/browser/newtab/newTab.inadjacent.json         (content/newtab/newTab.inadjacent.json)
+        content/browser/newtab/alternativeDefaultSites.json   (content/newtab/alternativeDefaultSites.json)
+*       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
+        content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
+        content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
+        content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
+        content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
+        content/browser/pageinfo/feeds.xml            (content/pageinfo/feeds.xml)
+        content/browser/pageinfo/permissions.js       (content/pageinfo/permissions.js)
+        content/browser/pageinfo/security.js          (content/pageinfo/security.js)
+        content/browser/sync/aboutSyncTabs.xul        (content/sync/aboutSyncTabs.xul)
+*       content/browser/sync/aboutSyncTabs.js         (content/sync/aboutSyncTabs.js)
+        content/browser/sync/aboutSyncTabs.css        (content/sync/aboutSyncTabs.css)
+        content/browser/sync/aboutSyncTabs-bindings.xml  (content/sync/aboutSyncTabs-bindings.xml)
+        content/browser/sync/setup.xul                (content/sync/setup.xul)
+        content/browser/sync/addDevice.js             (content/sync/addDevice.js)
+        content/browser/sync/addDevice.xul            (content/sync/addDevice.xul)
+        content/browser/sync/setup.js                 (content/sync/setup.js)
+        content/browser/sync/genericChange.xul        (content/sync/genericChange.xul)
+        content/browser/sync/genericChange.js         (content/sync/genericChange.js)
+        content/browser/sync/key.xhtml                (content/sync/key.xhtml)
+        content/browser/sync/utils.js                 (content/sync/utils.js)
+        content/browser/sync/customize.xul            (content/sync/customize.xul)
+        content/browser/sync/customize.js             (content/sync/customize.js)
+        content/browser/sync/customize.css            (content/sync/customize.css)
+        content/browser/safeMode.css                  (content/safeMode.css)
+        content/browser/safeMode.js                   (content/safeMode.js)
+        content/browser/safeMode.xul                  (content/safeMode.xul)
+        content/browser/sanitize.js                   (content/sanitize.js)
+*       content/browser/sanitize.xul                  (content/sanitize.xul)
+*       content/browser/sanitizeDialog.js             (content/sanitizeDialog.js)
+        content/browser/sanitizeDialog.css            (content/sanitizeDialog.css)
+        content/browser/contentSearchUI.js            (content/contentSearchUI.js)
+        content/browser/contentSearchUI.css           (content/contentSearchUI.css)
+        content/browser/tabbrowser.css                (content/tabbrowser.css)
+        content/browser/tabbrowser.xml                (content/tabbrowser.xml)
+*       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
+        content/browser/utilityOverlay.js             (content/utilityOverlay.js)
+        content/browser/usercontext.svg               (content/usercontext.svg)
+        content/browser/web-panels.js                 (content/web-panels.js)
+*       content/browser/web-panels.xul                (content/web-panels.xul)
+*       content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
+*       content/browser/nsContextMenu.js              (content/nsContextMenu.js)
+# XXX: We should exclude this one as well (bug 71895)
+*       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
+#ifdef XP_MACOSX
+*       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
+*       content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
+*       content/browser/softwareUpdateOverlay.xul     (content/softwareUpdateOverlay.xul)
+*       content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
+#endif
+*       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
+#ifndef XP_MACOSX
+*       content/browser/webrtcIndicator.xul           (content/webrtcIndicator.xul)
+        content/browser/webrtcIndicator.js            (content/webrtcIndicator.js)
+#endif
+# the following files are browser-specific overrides
+*       content/browser/license.html                  (/toolkit/content/license.html)
+% override chrome://global/content/license.html chrome://browser/content/license.html
+#ifdef MOZ_SAFE_BROWSING
+        content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
+        content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
+% overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
+#endif
+
+% override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml