diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 20:47:48 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 20:47:48 +0000 |
| commit | ab2b1c71c75fb342865db0f2f1bce222ad7978be (patch) | |
| tree | 6d87a17d040d6df339fbc54ee0f1812d96fd597f | |
| parent | e89a8851c1eb66ef2f5dfb23361a6ec02b28505d (diff) | |
| download | chromium_src-ab2b1c71c75fb342865db0f2f1bce222ad7978be.zip chromium_src-ab2b1c71c75fb342865db0f2f1bce222ad7978be.tar.gz chromium_src-ab2b1c71c75fb342865db0f2f1bce222ad7978be.tar.bz2 | |
Put an "(empty)" into the submenus of empty folders in the bookmark menu, to match the same in the non-menubar menus.
BUG=http://crbug.com/41768
TEST=as in bug
Review URL: http://codereview.chromium.org/1718016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45615 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/bookmark_menu_bridge.mm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.mm b/chrome/browser/cocoa/bookmark_menu_bridge.mm index 006b10b..e635548 100644 --- a/chrome/browser/cocoa/bookmark_menu_bridge.mm +++ b/chrome/browser/cocoa/bookmark_menu_bridge.mm @@ -67,8 +67,8 @@ void BookmarkMenuBridge::UpdateMenu(NSMenu* bookmark_menu) { } // Create a submenu for "other bookmarks", and fill it in. - NSString* other_items_title = base::SysWideToNSString( - l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); + NSString* other_items_title = + l10n_util::GetNSString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME); [bookmark_menu addItem:[NSMenuItem separatorItem]]; AddNodeAsSubmenu(bookmark_menu, model->other_node(), @@ -183,7 +183,14 @@ void BookmarkMenuBridge::AddNodeAsSubmenu(NSMenu* menu, // TODO(jrg): limit the number of bookmarks in the menubar? void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu) { - for (int i = 0; i < node->GetChildCount(); i++) { + int child_count = node->GetChildCount(); + if (!child_count) { + NSString* empty_string = l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU); + NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:empty_string + action:nil + keyEquivalent:@""] autorelease]; + [menu addItem:item]; + } else for (int i = 0; i < child_count; i++) { const BookmarkNode* child = node->GetChild(i); NSString* title = [BookmarkMenuCocoaController menuTitleForNode:child]; NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:title |