Hooked up context menus to bookmarks menu bindings.

bug=317834 r=beng sr=bryner

browser/base/content/browser-menubar.inc

@@ -394,7 +394,7 @@
 #else
   <menu id="bookmarksMenu" 
         label="&bookmarksMenu.label;" accesskey="&bookmarksMenu.accesskey;">
-    <menupopup id="bookmarksMenuPopup" type="places">
+    <menupopup id="bookmarksMenuPopup" type="places" context="placesContext">
       <menuitem label="&addCurPageAsCmd.label;" 
                 command="Browser:AddBookmarkAs" key="addBookmarkAsKb"/>
       <menuitem label="&manBookmarksCmd.label;" 

browser/components/places/content/menu.xml

@@ -113,6 +113,9 @@
                 var popup = document.createElementNS(XULNS, "menupopup");
                 popup.setAttribute("type", "places");
                 element.appendChild(popup);
+                // The context menu is set here instead of in the xbl constructor
+                // because it doesn't get initialized properly if set in the constructor.
+                popup.setAttribute("context", "placesContext");
                 popup.folderId = child.folderId;
                 element.className = "menu-iconic bookmark-item";
               }

browser/components/places/content/toolbar.xml

@@ -79,6 +79,9 @@
               button.setAttribute("container", "true");
               var popup = document.createElementNS(XULNS, "menupopup");
               popup.setAttribute("type", "places");
+              // This is set here and not in the XBL constructor for the menu because
+              // it doesn't get initialized properly in the constructor.
+              popup.setAttribute("context", "placesContext");
               button.appendChild(popup);
               popup.folderId = child.folderId;
             }
@@ -100,6 +103,9 @@
           overflowPadder.appendChild(this._chevron);
           var popup = document.createElementNS(XULNS, "menupopup");
           popup.setAttribute("type", "places");
+          // This is set here and not in the XBL constructor for the menu because
+          // it doesn't get initialized properly in the constructor.
+          popup.setAttribute("context", "placesContext");
           popup.folderId = this._result.folderId;
           var t = this;
           popup.popupShowingCallback = function() {t.chevronPopupShowing();};