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 99 matching lines @@
   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/05 23:53:58]

nit: Hmm, this isn't relevant to this CL so much as one of your previous ones;
but are these replacements still necessary now that we've updated the model?

[KushalP, 2011/12/13 17:39:06]

I'll have a look and see what happens when I remove it. It's assigned
post-addition to the model so I'd assume that it's safe to remove.

   // 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.

[Ilya Sherman, 2011/12/05 23:53:58]

nit: This comment should be moved into the "else" case, and updated to clarify
that we only do this for bookmarks directly on the bookmarks bar, but not for
those in folders.

   if ([title length]) {
     [self setImagePosition:NSImageLeft];
     [self setTitle:title];
+  } else if ([self isFolderButtonCell]) {
+    // A folder button cell in the bookmark bar scroll view should have
+    // the favicon aligned to the left.

[Ilya Sherman, 2011/12/05 23:53:58]

nit: "folder button cell" reads as slightly confusing to me in this comment. 
Perhaps "Left-align icons for bookmarks within folders, regardless of whether
there is a title."  (With a matching comment in the "else" case describing what
happens for bookmarks directly in the bar.)

+    [self setImagePosition:NSImageLeft];
   } else {
     [self setImagePosition:NSImageOnly];
   }
 
   if (image)
     [self setImage:image];
 }
 
 - (void)setBookmarkNode:(const BookmarkNode*)node {
   [self setRepresentedObject:[NSValue valueWithPointer:node]];
@@ skipping 110 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