Bug 1402059 - Don't import editBookmarkOverlay.js in places.xul on Mac because it is imported elsewhere. r?florian draft
authorMark Banner <standard8@mozilla.com>
Thu, 21 Sep 2017 19:35:04 +0100
changeset 668489 18645ca015fbf32206c957a152ffaf045fe41bcb
parent 668025 47f7b6c64265bc7bdd22eef7ab71abc97cf3f8bf
child 732719 de3e2ba4a2dd77b1d7b9559fddca93b0df914f02
push id81063
push userbmo:standard8@mozilla.com
push dateThu, 21 Sep 2017 18:37:54 +0000
reviewersflorian
bugs1402059
milestone57.0a1
Bug 1402059 - Don't import editBookmarkOverlay.js in places.xul on Mac because it is imported elsewhere. r?florian MozReview-Commit-ID: 5e32dMnLdik
browser/components/places/content/places.xul
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -39,18 +39,21 @@
         onunload="PlacesOrganizer.destroy();"
         width="&places.library.width;" height="&places.library.height;"
         screenX="10" screenY="10"
         toggletoolbar="true"
         persist="width height screenX screenY sizemode">
 
   <script type="application/javascript"
           src="chrome://browser/content/places/places.js"/>
+#ifndef XP_MACOSX
+  <!-- On Mac, this is included via macBrowserOverlay.xul -> browser.js -> defineLazyScriptGetter -->
   <script type="application/javascript"
           src="chrome://browser/content/places/editBookmarkOverlay.js"/>
+#endif
 
   <stringbundleset id="placesStringSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
 
 #ifdef XP_MACOSX
 #include ../../../base/content/browserMountPoints.inc