Fixes two bookmark manager bugs:

. Pressing enter when more than one folder is selected opens them all.
. Show in folder is only enabled when it makes sense: you've selected a
  bookmark in the table and the table is showing recently bookmarked
  or search results.

BUG=4034 4044
TEST=see bugs

Review URL: http://codereview.chromium.org/9367

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4780 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 4cc816f..9650e92 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -436,20 +436,21 @@ void BookmarkManagerView::ShowMenu(
       (config == BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU &&
        table_view_->HasFocus())) {
     std::vector<BookmarkNode*> nodes = GetSelectedTableNodes();
-    if (nodes.empty())
-      return;
-
     BookmarkNode* parent = GetSelectedFolder();
+    if (!parent) {
+      if (config == BookmarkContextMenu::BOOKMARK_MANAGER_TABLE)
+        config = BookmarkContextMenu::BOOKMARK_MANAGER_TABLE_OTHER;
+      else
+        config = BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU_OTHER;
+    }
     BookmarkContextMenu menu(host, profile_, NULL, NULL, parent, nodes,
                              config);
     menu.RunMenuAt(x, y);
   } else {
     BookmarkNode* node = GetSelectedFolder();
-    if (!node)
-      return;
-
     std::vector<BookmarkNode*> nodes;
-    nodes.push_back(node);
+    if (node)
+      nodes.push_back(node);
     BookmarkContextMenu menu(GetContainer()->GetHWND(), profile_, NULL, NULL,
                              node, nodes, config);
     menu.RunMenuAt(x, y);