Added menus for bookmark bar folders.

chrome/browser/cocoa/bookmark_menu_bridge.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/cocoa/bookmark_menu_bridge.h"
 #import <AppKit/AppKit.h>
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_BOOKMARK_MENU
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser.h"
@@ skipping 151 matching lines @@
         ([item hasSubmenu])) {
       // This will eventually [obj release] all its kids, if it has
       // any.
       [menu removeItem:item];
     } else {
       // Not a bookmark or item with submenu, so leave it alone.
     }
   }
 }
 
-namespace {
-
-// Menus more than this many chars long will get trimmed
-const NSUInteger kMaximumMenuWidthInChars = 65;
-
-// When trimming, use this many chars from each side
-const NSUInteger kMenuTrimSizeInChars = 30;
-
-}
-
 void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu) {
   for (int i = 0; i < node->GetChildCount(); i++) {
     const BookmarkNode* child = node->GetChild(i);
-    NSString* full_title = base::SysWideToNSString(child->GetTitle());
-    NSString* title = full_title;
-    if ([title length] > kMaximumMenuWidthInChars) {
-      // TODO(jrg): add a better heuristic?  I'd really like to trim this
-      // by pixels, not by chars (font is not fixed width).
-      // For Safari, it appears that menu names >60 chars get split up to
-      // 30char + "..." + 30char.
-      title = [NSString stringWithFormat:@"%@…%@",
-                 [title substringToIndex:kMenuTrimSizeInChars],
-                 [title substringFromIndex:([title length] -
-                                            kMenuTrimSizeInChars)]];
-    }
+    NSString* title = [BookmarkMenuCocoaController menuTitleForNode:child];
     NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:title
                                                    action:nil
                                             keyEquivalent:@""] autorelease];
     [menu addItem:item];
     if (child->is_folder()) {
       NSMenu* submenu = [[[NSMenu alloc] initWithTitle:title] autorelease];
       [menu setSubmenu:submenu forItem:item];
       AddNodeToMenu(child, submenu);  // recursive call
     } else {
       [item setTarget:controller_];
       [item setAction:@selector(openBookmarkMenuItem:)];
       [item setTag:child->id()];
       // Add a tooltip
       std::string url_string = child->GetURL().possibly_invalid_spec();
-      NSString* tooltip = [NSString stringWithFormat:@"%@\n%s", full_title,
+      NSString* tooltip = [NSString stringWithFormat:@"%@\n%s",
+                                    base::SysWideToNSString(child->GetTitle()),
                                     url_string.c_str()];
       [item setToolTip:tooltip];
 
     }
   }
 }