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

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

1 files changed, 17 insertions, 0 deletions

diff --git a/application/basilisk/components/downloads/content/contentAreaDownloadsView.js b/application/basilisk/components/downloads/content/contentAreaDownloadsView.js
new file mode 100644
index 000000000..6e4f18599
--- /dev/null
+++ b/application/basilisk/components/downloads/content/contentAreaDownloadsView.js
@@ -0,0 +1,17 @@
+/* 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/. */
+
+Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+
+var ContentAreaDownloadsView = {
+  init() {
+    let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox"));
+    // Do not display the Places downloads in private windows
+    if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) {
+      view.place = "place:transition=7&sort=4";
+    }
+    // Set focus to Downloads list once it is created
+    document.getElementById("downloadsRichListBox").focus();
+  },
+};