[Mac] Show context menu on empty BMB item.

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

 // Copyright (c) 2013 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_context_menu_cocoa_controller.h"
 
 #include <vector>
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 44 matching lines @@
 }
 
 // Re-creates |bookmarkContextMenuController_| and |menuController_| based on
 // |bookmarkModel| and the current value of |bookmarkNode_|.
 - (void)createMenuControllers:(BookmarkModel*)bookmarkModel {
   const BookmarkNode* parent = NULL;
   std::vector<const BookmarkNode*> nodes;
   if (bookmarkNode_ == bookmarkModel->other_node()) {
     nodes.push_back(bookmarkNode_);
     parent = bookmarkModel->bookmark_bar_node();
-  } else if (bookmarkNode_ != bookmarkModel->bookmark_bar_node()) {
+  } else if (bookmarkNode_ == bookmarkModel->bookmark_bar_node()) {
+    parent = bookmarkModel->bookmark_bar_node();
+    nodes.push_back(parent);
+  } else if (bookmarkNode_) {
     nodes.push_back(bookmarkNode_);
     parent = bookmarkNode_->parent();
-  } else {
-    parent = bookmarkModel->bookmark_bar_node();
-    nodes.push_back(parent);
   }
 
   Browser* browser = [bookmarkBarController_ browser];
   bookmarkContextMenuController_.reset(
       new BookmarkContextMenuController([bookmarkBarController_ browserWindow],
                                         bridge_.get(), browser,
                                         browser->profile(), browser, parent,
                                         nodes));
   ui::SimpleMenuModel* menuModel =
       bookmarkContextMenuController_->menu_model();
   menuController_.reset([[MenuController alloc] initWithModel:menuModel
                                        useWithPopUpButtonCell:NO]);
 }
 
-- (NSMenu*)menuForBookmarkNode:(const BookmarkNode*)node {
+- (BookmarkModel*)bookmarkModel {
   // Depending on timing, the model may not yet have been loaded.
   BookmarkModel* bookmarkModel = [bookmarkBarController_ bookmarkModel];
   if (!bookmarkModel || !bookmarkModel->loaded())
     return nil;
+  return bookmarkModel;
+}
+
+- (NSMenu*)menuForBookmarkNode:(const BookmarkNode*)node {
+  BookmarkModel* bookmarkModel = [self bookmarkModel];
 
   // This may be called before the BMB view has been added to the window. In
   // that case, simply return nil so that BookmarkContextMenuController doesn't
   // get created with a nil window.
-  if (![bookmarkBarController_ browserWindow])
+  if (!bookmarkModel || ![bookmarkBarController_ browserWindow])
     return nil;
 
-  if (!node)
-    node = bookmarkModel->bookmark_bar_node();
-
   // Rebuild the menu if it's for a different node than the last request.
   if (!menuController_ || node != bookmarkNode_) {
     bookmarkNode_ = node;
     [self createMenuControllers:bookmarkModel];
   }
   return [menuController_ menu];
 }
 
+- (NSMenu*)menuForBookmarkBar {
+  BookmarkModel* bookmarkModel = [self bookmarkModel];
+  if (!bookmarkModel)
+    return nil;
+
+  return [self menuForBookmarkNode:bookmarkModel->bookmark_bar_node()];
+}
+
 - (void)willExecuteCommand:(int)command {
   // Some items should not close currently-open sub-folder menus.
   switch (command) {
     case IDC_CUT:
     case IDC_COPY:
     case IDC_PASTE:
     case IDC_BOOKMARK_BAR_REMOVE:
       return;
   }
 
   [bookmarkBarController_ closeFolderAndStopTrackingMenus];
   [bookmarkBarController_ unhighlightBookmark:bookmarkNode_];
 }
 
 - (void)cancelTracking {
   [[menuController_ menu] cancelTracking];
 }
 
 @end