Bug 1443901 - Remove downloadsViewOverlay.xul. r=Paolo

This overlay was only used in places.xul and can be inlined there.

MozReview-Commit-ID: AYvmu99lqh5

--HG--
extra : rebase_source : f4ca7e5e198d172c6394aaf7fd81f011cc3c8439

browser/components/places/content/downloadsViewOverlay.xul

@@ -1,47 +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/. -->
-
-<?xul-overlay href="chrome://browser/content/downloads/allDownloadsViewOverlay.xul"?>
-
-<!DOCTYPE overlay [
-<!ENTITY % downloadsDTD SYSTEM "chrome://browser/locale/downloads/downloads.dtd">
-%downloadsDTD;
-]>
-
-<overlay id="downloadsViewOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript"><![CDATA[
-    const DOWNLOADS_QUERY = "place:transition=" +
-      Ci.nsINavHistoryService.TRANSITION_DOWNLOAD +
-      "&sort=" +
-      Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING;
-
-    ContentArea.setContentViewForQueryString(DOWNLOADS_QUERY,
-      () => new DownloadsPlacesView(document.getElementById("downloadsRichListBox"), false),
-      { showDetailsPane: false,
-        toolbarSet: "back-button, forward-button, organizeButton, clearDownloadsButton, libraryToolbarSpacer, searchFilter" });
-  ]]></script>
-
-  <window id="places">
-    <commandset id="downloadCommands"/>
-    <menupopup id="downloadsContextMenu"/>
-  </window>
-
-  <deck id="placesViewsDeck">
-    <richlistbox id="downloadsRichListBox"/>
-  </deck>
-
-  <toolbar id="placesToolbar">
-    <toolbarbutton id="clearDownloadsButton"
-#ifdef XP_MACOSX
-                   class="tabbable"
-#endif
-                   insertbefore="libraryToolbarSpacer"
-                   label="&clearDownloadsButton.label;"
-                   command="downloadsCmd_clearDownloads"
-                   tooltiptext="&clearDownloadsButton.tooltip;"/>
-  </toolbar>
-
-</overlay>

browser/components/places/content/places.js

@@ -4,10 +4,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* import-globals-from editBookmark.js */
-// Via downloadsViewOverlay.xul -> allDownloadsViewOverlay.xul
+// Via allDownloadsViewOverlay.xul
 /* import-globals-from ../../../../toolkit/content/contentAreaUtils.js */
 /* import-globals-from ../PlacesUIUtils.jsm */
 /* import-globals-from ../../../../toolkit/components/places/PlacesUtils.jsm */
+/* import-globals-from ../../downloads/content/allDownloadsViewOverlay.js */
 
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -134,6 +135,17 @@ var PlacesOrganizer = {
   },
 
   init: function PO_init() {
+    // Register the downloads view.
+    const DOWNLOADS_QUERY = "place:transition=" +
+      Ci.nsINavHistoryService.TRANSITION_DOWNLOAD +
+      "&sort=" +
+      Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING;
+
+    ContentArea.setContentViewForQueryString(DOWNLOADS_QUERY,
+      () => new DownloadsPlacesView(document.getElementById("downloadsRichListBox"), false),
+      { showDetailsPane: false,
+        toolbarSet: "back-button, forward-button, organizeButton, clearDownloadsButton, libraryToolbarSpacer, searchFilter" });
+
     ContentArea.init();
 
     this._places = document.getElementById("placesList");

browser/components/places/content/places.xul

@@ -15,10 +15,13 @@
 #ifdef XP_MACOSX
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 #endif
+<?xul-overlay href="chrome://browser/content/downloads/allDownloadsViewOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
 %placesDTD;
+<!ENTITY % downloadsDTD SYSTEM "chrome://browser/locale/downloads/downloads.dtd">
+%downloadsDTD;
 <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 %editMenuOverlayDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
@@ -104,7 +107,7 @@
     <command id="OrganizerCommand:Forward"
              oncommand="PlacesOrganizer.forward();"/>
   </commandset>
-
+  <commandset id="downloadCommands"/>
 
   <keyset id="placesOrganizerKeyset">
     <!-- Instantiation Keys -->
@@ -161,6 +164,7 @@
     <menupopup id="placesColumnsContext"
                onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
                oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
+    <menupopup id="downloadsContextMenu"/>
   </popupset>
 
   <toolbox id="placesToolbox">
@@ -350,6 +354,14 @@
                oncommand="PlacesSearchBox.search(this.value);"
                collection="bookmarks">
       </textbox>
+      <toolbarbutton id="clearDownloadsButton"
+#ifdef XP_MACOSX
+                     class="tabbable"
+#endif
+                     insertbefore="libraryToolbarSpacer"
+                     label="&clearDownloadsButton.label;"
+                     command="downloadsCmd_clearDownloads"
+                     tooltiptext="&clearDownloadsButton.tooltip;"/>
     </toolbar>
   </toolbox>
 
@@ -416,6 +428,7 @@
           </treecols>
           <treechildren flex="1" onclick="ContentTree.onClick(event);"/>
         </tree>
+        <richlistbox id="downloadsRichListBox"/>
       </deck>
       <deck id="detailsDeck" style="height: 11em;">
         <vbox id="itemsCountBox" align="center">

browser/components/places/jar.mn

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-% overlay chrome://browser/content/places/places.xul chrome://browser/content/places/downloadsViewOverlay.xul
 # Provide another URI for the bookmarkProperties dialog so we can persist the
 # attributes separately
 *   content/browser/places/bookmarkProperties2.xul       (content/bookmarkProperties.xul)
@@ -27,4 +26,3 @@ browser.jar:
     content/browser/bookmarks/bookmarksPanel.js          (content/bookmarksPanel.js)
     content/browser/bookmarks/sidebarUtils.js            (content/sidebarUtils.js)
     content/browser/places/editBookmark.js               (content/editBookmark.js)
-*   content/browser/places/downloadsViewOverlay.xul      (content/downloadsViewOverlay.xul)