Bug 50504 Context menu for bookmarks in main menu and personal toolbar submenus p=paradigmk@technodrome.com r+sr=me

suite/browser/navigator.xul

@@ -294,7 +294,8 @@
                      onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)" 
                      template="bookmarksMenuTemplate"
                      ondraggesture="if (event.target.id=='bookmarks-button') event.stopPropagation()">
-        <menupopup onpopupshowing="updateGroupmarkCommand();">
+        <menupopup context="bookmarks-context-menu"
+                   onpopupshowing="updateGroupmarkCommand();">
           <menuitem command="Browser:AddBookmark"/>
           <menuitem command="Browser:AddBookmarkAs"/>
           <menuitem command="Browser:AddGroupmarkAs"/>
@@ -324,6 +325,7 @@
                        oncommand="BookmarksUtils.loadBookmarkBrowser(event, this.database)"
                        onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)">
           <menupopup id="bookmarks-chevron-popup"
+                     context="bookmarks-context-menu"
                      onpopupshowing="if (event.target == this) BookmarksToolbar.updateOverflowMenu(this);"/>
         </toolbarbutton>
       </hbox>

suite/browser/navigatorOverlay.xul

@@ -217,7 +217,7 @@
   <!-- bookmarks context menu -->
   <popupset id="bookmarksPopupset">
     <popup id="bookmarks-context-menu" 
-           onpopupshowing="BookmarksMenu.createContextMenu(event);"
+           onpopupshowing="return BookmarksMenu.createContextMenu(event);"
            onpopuphidden ="BookmarksMenu.destroyContextMenu(event);"/>
   </popupset>
 
@@ -264,7 +264,7 @@
                      validate="never"
                      rdf:type="http://home.netscape.com/NC-rdf#Folder"
                      label="rdf:http://home.netscape.com/NC-rdf#Name">
-        <menupopup/>
+        <menupopup context="bookmarks-context-menu"/>
       </toolbarbutton>
     </rule>
     <rule parent="hbox">
@@ -306,7 +306,7 @@
               validate="never"
               label="rdf:http://home.netscape.com/NC-rdf#Name"
               type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
-          <menupopup />
+          <menupopup context="bookmarks-context-menu"/>
         </menu>
       </menupopup>
     </rule>
@@ -472,6 +472,7 @@
           ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
           ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
       <menupopup id="menu_BookmarksPopup"
+                 context="bookmarks-context-menu"
                  onpopupshowing="updateGroupmarkCommand();">
         <menuitem key="addBookmarkKb"   command="Browser:AddBookmark"/>
         <menuitem key="addBookmarkAsKb" command="Browser:AddBookmarkAs"/>