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

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

26 files changed, 0 insertions, 75 deletions

diff --git a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg b/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg
deleted file mode 100644
index 10ffbc745..000000000
--- a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="#666" stroke-width="2" fill="none">
-    <rect x="7" y="4" width="2" height="10" rx="0.25" ry="0.25"/>
-    <rect x="3" y="8" width="10" height="2" rx="0.25" ry="0.25"/>
-  </g>
-  <g fill="#fff">
-    <rect width="2" height="10" x="7" y="4"/>
-    <rect width="10" height="2" x="3" y="8"/>
-  </g>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/newtab-inverted.svg b/browser/themes/windows/tabbrowser/newtab-inverted.svg
deleted file mode 100644
index 2728cda5c..000000000
--- a/browser/themes/windows/tabbrowser/newtab-inverted.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="#666" stroke-width="2" fill="none">
-    <rect x="7" y="3" width="2" height="12" rx="0.25" ry="0.25"/>
-    <rect x="2" y="8" width="12" height="2" rx="0.25" ry="0.25"/>
-  </g>
-  <g fill="#fff">
-    <rect x="7" y="3" width="2" height="12"/>
-    <rect x="2" y="8" width="12" height="2"/>
-  </g>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/newtab-win7.svg b/browser/themes/windows/tabbrowser/newtab-win7.svg
deleted file mode 100644
index 3f431c9db..000000000
--- a/browser/themes/windows/tabbrowser/newtab-win7.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <linearGradient id="gradient" x1="0%" x2="0%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#1c2835"/>
-      <stop offset="60%" stop-color="#606e7b"/>
-      <stop offset="100%" stop-color="#465765"/>
-    </linearGradient>
-  </defs>
-  <g fill="url(#gradient)">
-    <rect width="10" height="2" x="3" y="8"/>
-    <rect width="2" height="10" x="7" y="4"/>
-  </g>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/newtab.svg b/browser/themes/windows/tabbrowser/newtab.svg
deleted file mode 100644
index 40548da4a..000000000
--- a/browser/themes/windows/tabbrowser/newtab.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- 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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg" fill="#4c4c4c">
-  <rect x="7" y="3" width="2" height="12"/>
-  <rect x="2" y="8" width="12" height="2"/>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle.png b/browser/themes/windows/tabbrowser/tab-active-middle.png
deleted file mode 100644
index b7e6d6f77..000000000
--- a/browser/themes/windows/tabbrowser/tab-active-middle.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-active-middle@2x.png b/browser/themes/windows/tabbrowser/tab-active-middle@2x.png
deleted file mode 100644
index 1e92acbda..000000000
--- a/browser/themes/windows/tabbrowser/tab-active-middle@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.svg b/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
deleted file mode 100644
index 13d3beb95..000000000
--- a/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- 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/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#666" stroke-width="1.5" stroke="#666" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
-  <path fill="#fff" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg b/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg
deleted file mode 100644
index 41bb5ab13..000000000
--- a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 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/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <linearGradient id="gradient" x1="0%" x2="0%" y1="0%" y2="100%">
-      <stop offset="0%" stop-color="#1c2835"/>
-      <stop offset="60%" stop-color="#606e7b"/>
-      <stop offset="100%" stop-color="#465765"/>
-    </linearGradient>
-  </defs>
-  <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="url(#gradient)"/>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/tab-arrow-left.svg b/browser/themes/windows/tabbrowser/tab-arrow-left.svg
deleted file mode 100644
index 9bd59ddd3..000000000
--- a/browser/themes/windows/tabbrowser/tab-arrow-left.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- 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/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
-  <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="#4c4c4c"/>
-</svg>
diff --git a/browser/themes/windows/tabbrowser/tab-background-end-preWin10.png b/browser/themes/windows/tabbrowser/tab-background-end-preWin10.png
deleted file mode 100644
index fb353b17e..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-end-preWin10.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png b/browser/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
deleted file mode 100644
index eefb6ac47..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-end.png b/browser/themes/windows/tabbrowser/tab-background-end.png
deleted file mode 100644
index d68ea6da6..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-end.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-end@2x.png b/browser/themes/windows/tabbrowser/tab-background-end@2x.png
deleted file mode 100644
index 8ed84ab37..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-end@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10.png b/browser/themes/windows/tabbrowser/tab-background-middle-preWin10.png
deleted file mode 100644
index 51e066c2e..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png b/browser/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
deleted file mode 100644
index b26cb95de..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle.png b/browser/themes/windows/tabbrowser/tab-background-middle.png
deleted file mode 100644
index faaf7e38e..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-middle.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-middle@2x.png b/browser/themes/windows/tabbrowser/tab-background-middle@2x.png
deleted file mode 100644
index c9d245f4f..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-middle@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-start-preWin10.png b/browser/themes/windows/tabbrowser/tab-background-start-preWin10.png
deleted file mode 100644
index cf0dc852a..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-start-preWin10.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png b/browser/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
deleted file mode 100644
index bbfc77dd1..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-start.png b/browser/themes/windows/tabbrowser/tab-background-start.png
deleted file mode 100644
index d1f0b5561..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-start.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-background-start@2x.png b/browser/themes/windows/tabbrowser/tab-background-start@2x.png
deleted file mode 100644
index e860275a6..000000000
--- a/browser/themes/windows/tabbrowser/tab-background-start@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end.png b/browser/themes/windows/tabbrowser/tab-stroke-end.png
deleted file mode 100644
index 2aa5711f8..000000000
--- a/browser/themes/windows/tabbrowser/tab-stroke-end.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png b/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png
deleted file mode 100644
index a87002a83..000000000
--- a/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start.png b/browser/themes/windows/tabbrowser/tab-stroke-start.png
deleted file mode 100644
index 4e4e41f63..000000000
--- a/browser/themes/windows/tabbrowser/tab-stroke-start.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png b/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png
deleted file mode 100644
index 13bd6add1..000000000
--- a/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/tabbrowser/tabDragIndicator.png b/browser/themes/windows/tabbrowser/tabDragIndicator.png
deleted file mode 100644
index 63c4eccad..000000000
--- a/browser/themes/windows/tabbrowser/tabDragIndicator.png
+++ /dev/null