Bug 371439 - Some old history & bookmarks frontend code is still built for places/places-bookmarks builds. r=gavin.
git-svn-id: svn://10.0.0.236/trunk@222218 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
280da05332
commit
07c2025baf
@ -52,6 +52,7 @@
|
|||||||
|
|
||||||
<commandset id="mainCommandSet">
|
<commandset id="mainCommandSet">
|
||||||
<command id="cmd_newNavigator" oncommand="OpenBrowserWindow()"/>
|
<command id="cmd_newNavigator" oncommand="OpenBrowserWindow()"/>
|
||||||
|
#ifndef MOZ_PLACES_BOOKMARKS
|
||||||
<command id="cmd_bm_open" oncommand="goDoCommand('cmd_bm_open');"/>
|
<command id="cmd_bm_open" oncommand="goDoCommand('cmd_bm_open');"/>
|
||||||
<command id="cmd_bm_openinnewwindow" oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
|
<command id="cmd_bm_openinnewwindow" oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
|
||||||
<command id="cmd_bm_openinnewtab" oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
|
<command id="cmd_bm_openinnewtab" oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
|
||||||
@ -66,6 +67,7 @@
|
|||||||
<command id="cmd_bm_rename" oncommand="goDoCommand('cmd_bm_rename');"/>
|
<command id="cmd_bm_rename" oncommand="goDoCommand('cmd_bm_rename');"/>
|
||||||
<command id="cmd_bm_moveBookmark" oncommand="goDoCommand('cmd_bm_moveBookmark');"/>
|
<command id="cmd_bm_moveBookmark" oncommand="goDoCommand('cmd_bm_moveBookmark');"/>
|
||||||
<command id="cmd_bm_sortbyname" oncommand="goDoCommand('cmd_bm_sortbyname');"/>
|
<command id="cmd_bm_sortbyname" oncommand="goDoCommand('cmd_bm_sortbyname');"/>
|
||||||
|
#endif
|
||||||
|
|
||||||
<command id="cmd_handleBackspace" oncommand="BrowserHandleBackspace();" />
|
<command id="cmd_handleBackspace" oncommand="BrowserHandleBackspace();" />
|
||||||
<command id="cmd_handleShiftBackspace" oncommand="BrowserHandleShiftBackspace();" />
|
<command id="cmd_handleShiftBackspace" oncommand="BrowserHandleShiftBackspace();" />
|
||||||
|
|||||||
@ -134,8 +134,10 @@
|
|||||||
<popup id="placesContext"/>
|
<popup id="placesContext"/>
|
||||||
</popupset>
|
</popupset>
|
||||||
|
|
||||||
|
#ifndef MOZ_PLACES
|
||||||
# The hacky hidden tree used by the Go menu to build items.
|
# The hacky hidden tree used by the Go menu to build items.
|
||||||
#include browser-gotreehack.inc
|
#include browser-gotreehack.inc
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef MOZ_PLACES_BOOKMARKS
|
#ifndef MOZ_PLACES_BOOKMARKS
|
||||||
<!-- bookmarks context menu -->
|
<!-- bookmarks context menu -->
|
||||||
|
|||||||
@ -72,8 +72,10 @@
|
|||||||
# browser-sets.inc file for sharing with hiddenWindow.xul.
|
# browser-sets.inc file for sharing with hiddenWindow.xul.
|
||||||
#include browser-sets.inc
|
#include browser-sets.inc
|
||||||
|
|
||||||
|
#ifndef MOZ_PLACES
|
||||||
# The hacky hidden tree used by the Go menu to build items.
|
# The hacky hidden tree used by the Go menu to build items.
|
||||||
#include browser-gotreehack.inc
|
#include browser-gotreehack.inc
|
||||||
|
#endif
|
||||||
|
|
||||||
# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
|
# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
|
||||||
# hiddenWindow.xul.
|
# hiddenWindow.xul.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user