Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-06-20 06:47:51 +08:00
commit ab4f78f4b7
46 changed files with 1004 additions and 604 deletions

View file

@ -153,8 +153,12 @@
#ifdef XP_MACOSX
<toolbarbutton type="menu" class="tabbable"
onpopupshowing="document.getElementById('placeContent').focus()"
#else
#ifdef MOZ_WIDGET_GTK
<menubar id="placesMenu" _moz-menubarkeeplocal="true">
#else
<menubar id="placesMenu">
#endif
<menu accesskey="&organize.accesskey;" class="menu-iconic"
#endif
id="organizeButton" label="&organize.label;"