[Mac] Restore the old bookmark menus now that the experiment is over.

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"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #include "content/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/mac/nsimage_cache.h"
 
 
 @interface BookmarkButtonCell(Private)
 - (void)configureBookmarkButtonCell;
 - (void)applyTextColor;
 @end
 
 
 @implementation BookmarkButtonCell
 
+@synthesize startingChildIndex = startingChildIndex_;
+@synthesize drawFolderArrow = drawFolderArrow_;
+
 + (id)buttonCellForNode:(const BookmarkNode*)node
             contextMenu:(NSMenu*)contextMenu
                cellText:(NSString*)cellText
               cellImage:(NSImage*)cellImage {
   id buttonCell =
       [[[BookmarkButtonCell alloc] initForNode:node
                                    contextMenu:contextMenu
                                       cellText:cellText
                                      cellImage:cellImage]
        autorelease];
@@ skipping 26 matching lines @@
 - (id)initTextCell:(NSString*)string {
   return [self initForNode:nil contextMenu:nil cellText:string cellImage:nil];
 }
 
 // Used by the off-the-side menu, the only case where a
 // BookmarkButtonCell is loaded from a nib.
 - (void)awakeFromNib {
   [self configureBookmarkButtonCell];
 }
 
+- (BOOL)isFolderButtonCell {
+  return NO;
+}
+
 // Perform all normal init routines specific to the BookmarkButtonCell.
 - (void)configureBookmarkButtonCell {
   [self setButtonType:NSMomentaryPushInButton];
   [self setBezelStyle:NSShadowlessSquareBezelStyle];
   [self setShowsBorderOnlyWhileMouseInside:YES];
   [self setControlSize:NSSmallControlSize];
   [self setAlignment:NSLeftTextAlignment];
   [self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [self setWraps:NO];
   // NSLineBreakByTruncatingMiddle seems more common on OSX but let's
@@ skipping 111 matching lines @@
   [super mouseEntered:event];
   [[self controlView] mouseEntered:event];
 }
 
 // See comment above mouseEntered:, above.
 - (void)mouseExited:(NSEvent*)event {
   [[self controlView] mouseExited:event];
   [super mouseExited:event];
 }
 
+- (void)setDrawFolderArrow:(BOOL)draw {
+  drawFolderArrow_ = draw;
+  if (draw && !arrowImage_) {
+    arrowImage_.reset(
+        [gfx::GetCachedImageWithName(@"menu_hierarchy_arrow.pdf") retain]);
+  }
+}
+
+// Add extra size for the arrow so it doesn't overlap the text.
+// Does not sanity check to be sure this is actually a folder node.
+- (NSSize)cellSize {
+  NSSize cellSize = [super cellSize];
+  if (drawFolderArrow_) {
+    cellSize.width += [arrowImage_ size].width;  // plus margin?
+  }
+  return cellSize;
+}
+
+// Override cell drawing to add a submenu arrow like a real menu.
+- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
+  // First draw "everything else".
+  [super drawInteriorWithFrame:cellFrame inView:controlView];
+
+  // If asked to do so, and if a folder, draw the arrow.
+  if (!drawFolderArrow_)
+    return;
+  BookmarkButton* button = static_cast<BookmarkButton*>([self controlView]);
+  DCHECK([button respondsToSelector:@selector(isFolder)]);
+  if ([button isFolder]) {
+    NSRect imageRect = NSZeroRect;
+    imageRect.size = [arrowImage_ size];
+    const CGFloat kArrowOffset = 1.0;  // Required for proper centering.
+    CGFloat dX = NSWidth(cellFrame) - NSWidth(imageRect);
+    CGFloat dY = (NSHeight(cellFrame) / 2.0) - (NSHeight(imageRect) / 2.0) +
+        kArrowOffset;
+    NSRect drawRect = NSOffsetRect(imageRect, dX, dY);
+    [arrowImage_ drawInRect:drawRect
+                    fromRect:imageRect
+                   operation:NSCompositeSourceOver
+                    fraction:[self isEnabled] ? 1.0 : 0.5
+                neverFlipped:YES];
+  }
+}
+
 @end