Mac. Build bookmark tooltips more intelligently, not showing title if same as URL.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "app/mac/nsimage_cache.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
@@ skipping 1127 matching lines @@
     [menu setSubmenu:submenu forItem:item];
     if (child->child_count()) {
       [self addFolderNode:child toMenu:submenu];  // potentially recursive
     } else {
       [self tagEmptyMenu:submenu];
     }
   } else {
     [item setTarget:self];
     [item setAction:@selector(openBookmarkMenuItem:)];
     [item setTag:[self menuTagFromNodeId:child->id()]];
-    if (child->is_url()) {
-      // Add a tooltip
-      std::string url_string = child->GetURL().possibly_invalid_spec();
-      NSString* tooltip = [NSString stringWithFormat:@"%@\n%s",
-                           base::SysUTF16ToNSString(child->GetTitle()),
-                           url_string.c_str()];
-      [item setToolTip:tooltip];
-    }
+    if (child->is_url())
+      [item setToolTip:[self tooltipForNode:child]];
   }
 }
 
 // Empty menus are odd; if empty, add something to look at.
 // Matches windows behavior.
 - (void)tagEmptyMenu:(NSMenu*)menu {
   NSString* empty_menu_title = l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU);
   [menu addItem:[[[NSMenuItem alloc] initWithTitle:empty_menu_title
                                             action:NULL
                                      keyEquivalent:@""] autorelease]];
@@ skipping 59 matching lines @@
   int xOffset = 0;
   for (int i = 0; i < node->child_count(); i++) {
     const BookmarkNode* child = node->GetChild(i);
     BookmarkButton* button = [self buttonForNode:child xOffset:&xOffset];
     if (NSMinX([button frame]) >= maxViewX)
       break;
     [buttons_ addObject:button];
   }
 }
 
+- (NSString*)tooltipForNode:(const BookmarkNode*)node {
+  NSString* title = base::SysUTF16ToNSString(node->GetTitle());
+  std::string url_string = node->GetURL().possibly_invalid_spec();
+  NSString *url = [NSString stringWithUTF8String:url_string.c_str()];

[mrossetti, 2011/05/25 23:35:54]

Nit: Move asterisk left.

+  if ([title length] == 0)
+    return url;
+  else if ([url length] == 0 || [url isEqualToString:title])
+    return title;
+  else
+    return [NSString stringWithFormat:@"%@\n%@", title, url];
+}
+
 - (BookmarkButton*)buttonForNode:(const BookmarkNode*)node
                          xOffset:(int*)xOffset {
   BookmarkButtonCell* cell = [self cellForBookmarkNode:node];
   NSRect frame = [self frameForBookmarkButtonFromCell:cell xOffset:xOffset];
 
   scoped_nsobject<BookmarkButton>
       button([[BookmarkButton alloc] initWithFrame:frame]);
   DCHECK(button.get());
 
   // [NSButton setCell:] warns to NOT use setCell: other than in the
@@ skipping 19 matching lines @@
   }
 
   if (node->is_folder()) {
     [button setTarget:self];
     [button setAction:@selector(openBookmarkFolderFromButton:)];
     [button setActsOnMouseDown:YES];
   } else {
     // Make the button do something
     [button setTarget:self];
     [button setAction:@selector(openBookmark:)];
-    if (node->is_url()) {
-      // Add a tooltip.
-      NSString* title = base::SysUTF16ToNSString(node->GetTitle());
-      std::string url_string = node->GetURL().possibly_invalid_spec();
-      NSString* tooltip = [NSString stringWithFormat:@"%@\n%s", title,
-                           url_string.c_str()];
-      [button setToolTip:tooltip];
-    }
+    if (node->is_url())
+      [button setToolTip:[self tooltipForNode:node]];
   }
   return [[button.get() retain] autorelease];
 }
 
 // Add non-bookmark buttons to the view.  This includes the chevron
 // and the "other bookmarks" button.  Technically "other bookmarks" is
 // a bookmark button but it is treated specially.  Only needs to be
 // called when these buttons are new or when the bookmark bar is
 // cleared (e.g. on a loaded: call).  Unlike addButtonsToView below,
 // we don't need to add/remove these dynamically in response to window
@@ skipping 1435 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end