Mac: Add a shortcut to open the Apps page from the bookmark bar.

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 14 matching lines @@
 @end
 
 
 @implementation BookmarkButtonCell
 
 @synthesize startingChildIndex = startingChildIndex_;
 @synthesize drawFolderArrow = drawFolderArrow_;
 
 + (id)buttonCellForNode:(const BookmarkNode*)node
          menuController:(BookmarkContextMenuCocoaController*)menuController
-               cellText:(NSString*)cellText
-              cellImage:(NSImage*)cellImage {
+                   text:(NSString*)text
+                  image:(NSImage*)image {
   id buttonCell =
       [[[BookmarkButtonCell alloc] initForNode:node
                                 menuController:menuController
-                                      cellText:cellText
-                                     cellImage:cellImage]
+                                          text:text
+                                         image:image]
+       autorelease];
+  return buttonCell;
+}
+
++ (id)buttonCellWithMenuController:(BookmarkContextMenuCocoaController*)menuController
+                              text:(NSString*)text
+                             image:(NSImage*)image {
+  id buttonCell =
+      [[[BookmarkButtonCell alloc] initWithMenuController:menuController
+                                                     text:text
+                                                    image:image]
        autorelease];
   return buttonCell;
 }
 
 - (id)initForNode:(const BookmarkNode*)node
    menuController:(BookmarkContextMenuCocoaController*)menuController
-         cellText:(NSString*)cellText
-        cellImage:(NSImage*)cellImage {
-  if ((self = [super initTextCell:cellText])) {
+             text:(NSString*)text
+            image:(NSImage*)image {
+  if ((self = [super initTextCell:text])) {
     menuController_ = menuController;
     [self configureBookmarkButtonCell];
     [self setTextColor:[NSColor blackColor]];
     [self setBookmarkNode:node];
 
     if (node) {
       NSString* title = base::SysUTF16ToNSString(node->GetTitle());
-      [self setBookmarkCellText:title image:cellImage];
+      [self setBookmarkCellText:title image:image];
     } else {
       [self setEmpty:YES];
       [self setBookmarkCellText:l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU)
                           image:nil];
     }
   }
 
   return self;
 }
 
+- (id)initWithMenuController:(BookmarkContextMenuCocoaController*)menuController
+                        text:(NSString*)text
+                       image:(NSImage*)image {
+  if ((self = [super initTextCell:text])) {
+    menuController_ = menuController;
+    [self configureBookmarkButtonCell];
+    [self setTextColor:[NSColor blackColor]];
+    [self setBookmarkNode:NULL];
+    [self setBookmarkCellText:text image:image];
+    // This is a custom button not attached to any node. It is no considered
+    // empty even if its bookmark node is NULL.
+    [self setEmpty:NO];
+  }
+
+  return self;
+}
+
 - (id)initTextCell:(NSString*)string {
-  return [self initForNode:nil
-            menuController:nil
-                  cellText:string
-                 cellImage:nil];
+  return [self initForNode:nil menuController:nil text:string image: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;
@@ skipping 70 matching lines @@
 
 - (const BookmarkNode*)bookmarkNode {
   return static_cast<const BookmarkNode*>([[self representedObject]
                                             pointerValue]);
 }
 
 - (NSMenu*)menu {
   if (empty_)
     return nil;
 
+  // If node is NULL, this is a custom button, the menu does not represent
+  // anything.

[Alexei Svitkine (slow), 2013/03/11 14:31:04]

Hmm, my other refactoring CL didn't actually remove this whole method, as I told
you offline.

I don't think this does what the current Windows implementation does. We still
want to have some kind of context menu here, so that the user can at least
uncheck App shortcut item in it.

[beaudoin, 2013/03/11 21:02:51]

Done.

   const BookmarkNode* node = [self bookmarkNode];
+  if (!node)
+    return nil;
+
   if (node->parent() && node->parent()->type() == BookmarkNode::FOLDER) {
     content::RecordAction(UserMetricsAction("BookmarkBarFolder_CtxMenu"));
   } else {
     content::RecordAction(UserMetricsAction("BookmarkBar_CtxMenu"));
   }
   return [menuController_ menuForBookmarkNode:node];
 }
 
 - (void)setTitle:(NSString*)title {
   if ([[self title] isEqualTo:title])
@@ skipping 87 matching lines @@
               respectFlipped:YES
                        hints:nil];
   }
 }
 
 - (int)verticalTextOffset {
   return 0;
 }
 
 @end