[Mac] Replace the custom bookmark menus with native NSMenus.

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h

 // 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.
 
-// C++ controller for the bookmark menu; one per AppController (which
-// means there is only one).  When bookmarks are changed, this class
-// takes care of updating Cocoa bookmark menus.  This is not named
-// BookmarkMenuController to help avoid confusion between languages.
-// This class needs to be C++, not ObjC, since it derives from
-// BookmarkModelObserver.
+
+// C++ class that connects a BookmarkNode (or the entire model) to a Cocoa class
+// that manages an NSMenu.  Commonly this is for the main menu and that instance
+// is owned by the AppController.  This is also used by the folder menus on the
+// bookmark bar.
 //
-// Most Chromium Cocoa menu items are static from a nib (e.g. New
-// Tab), but may be enabled/disabled under certain circumstances
+// In the main menu case, most Chromium Cocoa menu items are static from a nib
+// (e.g. New Tab), but may be enabled/disabled under certain circumstances
 // (e.g. Cut and Paste).  In addition, most Cocoa menu items have
 // firstResponder: as a target.  Unusually, bookmark menu items are
 // created dynamically.  They also have a target of
 // BookmarkMenuCocoaController instead of firstResponder.
 // See BookmarkMenuBridge::AddNodeToMenu()).
 
 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_
 #pragma once
 
 #include <map>
 
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #import "chrome/browser/ui/cocoa/main_menu_item.h"
 
 class BookmarkNode;
 class Profile;
 @class NSImage;
 @class NSMenu;
 @class NSMenuItem;
 @class BookmarkMenuCocoaController;
 
 class BookmarkMenuBridge : public BookmarkModelObserver,
                            public MainMenuItem {
  public:
+  // Constructor for the main menu which lists all bookmarks.
   BookmarkMenuBridge(Profile* profile, NSMenu* menu);
+
+  // Constructor for a submenu.
+  BookmarkMenuBridge(const BookmarkNode* root_node,
+                     Profile* profile,
+                     NSMenu* menu);
+
   virtual ~BookmarkMenuBridge();
 
   // BookmarkModelObserver:
   virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
                                  int new_index) OVERRIDE;
@@ skipping 17 matching lines @@
 
   // Rebuilds the main bookmark menu, if it has been marked invalid.
   void UpdateMenu(NSMenu* bookmark_menu);
 
   // Rebuilds a bookmark menu that's a submenu of another menu.
   void UpdateSubMenu(NSMenu* bookmark_menu);
 
   // I wish I had a "friend @class" construct.
   BookmarkModel* GetBookmarkModel();
   Profile* GetProfile();
+  BookmarkMenuCocoaController* controller() { return controller_.get(); }
 
  protected:
   // Rebuilds the bookmark content of supplied menu.
   void UpdateMenuInternal(NSMenu* bookmark_menu, bool is_submenu);
 
   // Clear all bookmarks from the given bookmark menu.
   void ClearBookmarkMenu(NSMenu* menu);
 
   // Mark the bookmark menu as being invalid.
-  void InvalidateMenu()  { menuIsValid_ = false; }
+  void InvalidateMenu()  { menu_is_valid_ = false; }
 
   // Helper for adding the node as a submenu to the menu with the
   // given title.
   // If |add_extra_items| is true, also adds extra menu items at bottom of
   // menu, such as "Open All Bookmarks".
   void AddNodeAsSubmenu(NSMenu* menu,
                         const BookmarkNode* node,
                         NSString* title,
                         bool add_extra_items);
 
@@ skipping 29 matching lines @@
   // Return the Bookmark menu.
   virtual NSMenu* BookmarkMenu();
 
   // Start watching the bookmarks for changes.
   void ObserveBookmarkModel();
 
  private:
   friend class BookmarkMenuBridgeTest;
 
   // True iff the menu is up-to-date with the actual BookmarkModel.
-  bool menuIsValid_;
+  bool menu_is_valid_;
 
-  Profile* profile_;  // weak
-  BookmarkMenuCocoaController* controller_;  // strong
+  // The root node of the menu.
+  const BookmarkNode* root_node_;
+
+  Profile* profile_;  // Weak.
+  scoped_nsobject<BookmarkMenuCocoaController> controller_;
 
   // The folder image so we can use one copy for all.
   scoped_nsobject<NSImage> folder_image_;
 
   // In order to appropriately update items in the bookmark menu, without
   // forcing a rebuild, map the model's nodes to menu items.
   std::map<const BookmarkNode*, NSMenuItem*> bookmark_nodes_;
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_