Bug 1402059 - Don't import editBookmarkOverlay.js in places.xul on Mac because it is imported elsewhere. r=florian, a=sledru
authorMark Banner <standard8@mozilla.com>
Thu, 21 Sep 2017 19:35:04 +0100
changeset 431831 f0c4b2d3fcb5afe3e4b75b24563e2084b61ca490
parent 431830 0922e331d03daf1a88235e74d03ac7e922a1dc7e
child 431832 508f470ffb60f0135864855cf64f8374687b9438
push id7821
push userryanvm@gmail.com
push dateMon, 25 Sep 2017 14:09:06 +0000
treeherdermozilla-beta@fd78928b00d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian, sledru
bugs1402059
milestone57.0
Bug 1402059 - Don't import editBookmarkOverlay.js in places.xul on Mac because it is imported elsewhere. r=florian, a=sledru 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