Bug 119599: add UI for bookmark groups in the File Bookmark dialog. r=bryner, sr=hewitt, a=asa

suite/browser/navigator.js

@@ -707,6 +707,15 @@ function OpenBookmarkURL(node, datasources)
     openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
 }
 
+function addBookmarkAs()
+{
+  const browsers = gBrowser.browsers;
+  if (browsers.length > 1)
+    BookmarksUtils.addBookmarkForTabBrowser(gBrowser);
+  else
+    BookmarksUtils.addBookmarkForBrowser(gBrowser.webNavigation, true);
+}
+
 function readRDFString(aDS,aRes,aProp)
 {
   var n = aDS.GetTarget(aRes, aProp, true);

suite/browser/navigator.xul

@@ -169,9 +169,11 @@ Contributor(s): ______________________________________. -->
                  onblur="URLBarBlurHandler(event);">
           <deck id="page-proxy-deck">
             <image id="page-proxy-button"
+                   onclick="BookmarksUtils.addBookmarkForBrowser(getBrowser().webNavigation, true);"
                    ondraggesture="PageProxyDragGesture(event);"
                    tooltiptext="&proxyIcon.tooltip;"/>
             <image id="page-proxy-favicon" validate="never"
+                   onclick="BookmarksUtils.addBookmarkForBrowser(getBrowser().webNavigation, true);"
                    ondraggesture="PageProxyDragGesture(event);"
                    onload="this.parentNode.selectedIndex = 1;
                            event.stopPropagation();

suite/browser/navigatorOverlay.xul

@@ -144,8 +144,9 @@
     <!-- Bookmarks Menu -->
     <command id="Browser:AddBookmark" label="&addCurPageCmd.label;" accesskey="&addCurPageCmd.accesskey;" 
              oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation, false);"/>
-    <command id="Browser:AddBookmarkAs" label="&addCurPageAsCmd.label;" accesskey="&addCurPageAsCmd.accesskey;" 
-             oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation, true);"/>
+    <command id="Browser:AddBookmarkAs" label="&addCurPageAsCmd.label;"
+             accesskey="&addCurPageAsCmd.accesskey;"
+             oncommand="addBookmarkAs();"/>
     <command id="Browser:ManageBookmark" label="&manBookmarksCmd.label;" accesskey="&manBookmarksCmd.accesskey;" 
              oncommand="BrowserEditBookmarks();" />