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

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

1 files changed, 54 insertions, 0 deletions

diff --git a/application/basilisk/components/preferences/in-content/containers.xul b/application/basilisk/components/preferences/in-content/containers.xul
new file mode 100644
index 000000000..e83bac1c3
--- /dev/null
+++ b/application/basilisk/components/preferences/in-content/containers.xul
@@ -0,0 +1,54 @@
+# 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/.
+
+<!-- Containers panel -->
+
+<script type="application/javascript"
+        src="chrome://browser/content/preferences/in-content/containers.js"/>
+
+<preferences id="containerPreferences" hidden="true" data-category="paneContainer">
+  <!-- Containers -->
+  <preference id="privacy.userContext.enabled"
+              name="privacy.userContext.enabled"
+              type="bool"/>
+
+</preferences>
+
+<hbox hidden="true"
+      class="container-header-links"
+      data-category="paneContainers">
+  <label class="text-link" id="backContainersLink" value="&backLink.label;" />
+</hbox>
+
+<hbox id="header-containers"
+      class="header"
+      hidden="true"
+      data-category="paneContainers">
+  <label class="header-name" flex="1">&paneContainers.title;</label>
+  <button class="help-button"
+          aria-label="&helpButton.label;"/>
+</hbox>
+
+<!-- Containers -->
+<groupbox id="browserContainersGroup" data-category="paneContainers" hidden="true">
+  <vbox id="browserContainersbox">
+
+    <richlistbox id="containersView" orient="vertical" persist="lastSelectedType"
+                 flex="1">
+      <listheader equalsize="always">
+          <treecol id="typeColumn" label="&label.label;" value="type"
+                   persist="sortDirection"
+                   flex="1" sortDirection="ascending"/>
+          <treecol id="actionColumn" value="action"
+                   persist="sortDirection"
+                   flex="1"/>
+      </listheader>
+    </richlistbox>
+  </vbox>
+  <vbox>
+    <hbox flex="1">
+      <button onclick="gContainersPane.onAddButtonClick();" accesskey="&addButton.accesskey;" label="&addButton.label;"/>
+    </hbox>
+  </vbox>
+</groupbox>