A BookmarkBarFolderButtonCell should have the favicon aligned left when no title is provided

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.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_button_cell.h"
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
@@ skipping 96 matching lines @@
   NSSize size = [super cellSizeForBounds:aRect];
   // Cocoa seems to slightly underestimate how much space we need, so we
   // compensate here to avoid a clipped rendering.
   size.width += 2;
   size.height += 4;
   return size;
 }
 
 - (void)setBookmarkCellText:(NSString*)title
                       image:(NSImage*)image {
-  title = [title stringByReplacingOccurrencesOfString:@"\n"
-                                           withString:@" "];
-  title = [title stringByReplacingOccurrencesOfString:@"\r"
-                                           withString:@" "];

[Ilya Sherman, 2011/12/13 22:35:24]

nit: For the sake of clarity when scanning the revision history later on, please
make this change in a separate CL.

[KushalP, 2011/12/13 22:51:31]

As in a completely different commit to the repo? Sorry if this is a dumb
question I just get confused as CL is a perforce term.

-  // If there is no title, squeeze things tight by displaying only the image; by
-  // default, Cocoa leaves extra space in an attempt to display an empty title.
   if ([title length]) {
     [self setImagePosition:NSImageLeft];
     [self setTitle:title];
+  } else if ([self isFolderButtonCell]) {
+    // Left-align icons for bookmarks within folders, regardless of whether
+    // there is a title.
+    [self setImagePosition:NSImageLeft];
   } else {
+    // Only show the icon when there is no title and the cell is on the
+    // bookmarks bar (directly) and not in a folder.

[Ilya Sherman, 2011/12/13 22:35:24]

nit: This comment is a little confusing, because it initially sounds like it
will be saying "Only show the icon when foo, otherwise don't show the icon",
whereas what it's really saying is "Show just the icon, no title, when foo." 
It's also a little confusing because there's nothing other than the icon to show
if there isn't at title -- setting the image position to NSImageOnly really just
affects the spacing of the icon.  I think the old comment conveyed this pretty
well, so I'd tweak it to something like:

// For untitled bookmarks visible directly in the bookmarks bar, squeeze
// things tight by displaying only the image. By default, Cocoa leaves extra
// space in an attempt to display an empty title.

     [self setImagePosition:NSImageOnly];
   }
 
   if (image)
     [self setImage:image];
 }
 
 - (void)setBookmarkNode:(const BookmarkNode*)node {
   [self setRepresentedObject:[NSValue valueWithPointer:node]];
 }
@@ skipping 109 matching lines @@
     NSRect drawRect = NSOffsetRect(imageRect, dX, dY);
     [arrowImage_ drawInRect:drawRect
                     fromRect:imageRect
                    operation:NSCompositeSourceOver
                     fraction:[self isEnabled] ? 1.0 : 0.5
                 neverFlipped:YES];
   }
 }
 
 @end