Implement the "(empty)" disabled item placed in empty bookmark menus.

(As a side effect, this patch also fixes disabled items in the rest
of the bookmarks bar.)

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

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

1 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
index ffc3953..293dab2 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
@@ -4,11 +4,13 @@
 
 #include "chrome/browser/bookmarks/bookmark_menu_controller_gtk.h"
 
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
-#include "app/resource_bundle.h"
+#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "webkit/glue/window_open_disposition.h"
 
@@ -50,7 +52,8 @@ void BookmarkMenuController::BookmarkNodeFavIconLoaded(BookmarkModel* model,
 }
 
 bool BookmarkMenuController::IsCommandEnabled(int id) const {
-  return true;
+  // -1 is reserved for empty.
+  return id != -1;
 }
 
 void BookmarkMenuController::ExecuteCommand(int id) {
@@ -98,4 +101,9 @@ void BookmarkMenuController::BuildMenu(BookmarkNode* parent,
     }
     menu_id_to_node_map_[id] = node;
   }
+
+  if (parent->GetChildCount() == 0) {
+    menu->AppendMenuItemWithLabel(
+        -1, l10n_util::GetStringUTF8(IDS_MENU_EMPTY_SUBMENU));
+  }
 }