bookmarks: Move BookmarkNode into 'bookmarks' namespace.

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.
 //
 // 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_
 
 #include <map>
 
 #include "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/main_menu_item.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 
-class BookmarkNode;
 class Profile;
 @class NSImage;
 @class NSMenu;
 @class NSMenuItem;
 @class BookmarkMenuCocoaController;
 
+namespace bookmarks {
+class BookmarkNode;
+}
+
 class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
                            public MainMenuItem {
  public:
   BookmarkMenuBridge(Profile* profile, NSMenu* menu);
   ~BookmarkMenuBridge() override;
 
   // bookmarks::BookmarkModelObserver:
   void BookmarkModelLoaded(bookmarks::BookmarkModel* model,
                            bool ids_reassigned) override;
   void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override;
   void BookmarkNodeMoved(bookmarks::BookmarkModel* model,
-                         const BookmarkNode* old_parent,
+                         const bookmarks::BookmarkNode* old_parent,
                          int old_index,
-                         const BookmarkNode* new_parent,
+                         const bookmarks::BookmarkNode* new_parent,
                          int new_index) override;
   void BookmarkNodeAdded(bookmarks::BookmarkModel* model,
-                         const BookmarkNode* parent,
+                         const bookmarks::BookmarkNode* parent,
                          int index) override;
   void BookmarkNodeRemoved(bookmarks::BookmarkModel* model,
-                           const BookmarkNode* parent,
+                           const bookmarks::BookmarkNode* parent,
                            int old_index,
-                           const BookmarkNode* node,
+                           const bookmarks::BookmarkNode* node,
                            const std::set<GURL>& removed_urls) override;
   void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model,
                                    const std::set<GURL>& removed_urls) override;
   void BookmarkNodeChanged(bookmarks::BookmarkModel* model,
-                           const BookmarkNode* node) override;
+                           const bookmarks::BookmarkNode* node) override;
   void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model,
-                                  const BookmarkNode* node) override;
-  void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model,
-                                     const BookmarkNode* node) override;
+                                  const bookmarks::BookmarkNode* node) override;
+  void BookmarkNodeChildrenReordered(
+      bookmarks::BookmarkModel* model,
+      const bookmarks::BookmarkNode* node) override;
 
   // MainMenuItem:
   void ResetMenu() override;
   void BuildMenu() override;
 
   // 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);
@@ skipping 13 matching lines @@
   void ClearBookmarkMenu(NSMenu* menu);
 
   // Mark the bookmark menu as being invalid.
   void InvalidateMenu()  { menuIsValid_ = false; }
 
   // Helper for adding the node as a submenu to the menu with the |node|'s title
   // and the given |image| as its icon.
   // 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,
+                        const bookmarks::BookmarkNode* node,
                         NSImage* image,
                         bool add_extra_items);
 
   // Helper for recursively adding items to our bookmark menu.
   // All children of |node| will be added to |menu|.
   // If |add_extra_items| is true, also adds extra menu items at bottom of
   // menu, such as "Open All Bookmarks".
   // TODO(jrg): add a counter to enforce maximum nodes added
-  void AddNodeToMenu(const BookmarkNode* node, NSMenu* menu,
+  void AddNodeToMenu(const bookmarks::BookmarkNode* node,
+                     NSMenu* menu,
                      bool add_extra_items);
 
   // Helper for adding an item to our bookmark menu. An item which has a
   // localized title specified by |message_id| will be added to |menu|.
   // The item is also bound to |node| by tag. |command_id| selects the action.
   void AddItemToMenu(int command_id,
                      int message_id,
-                     const BookmarkNode* node,
+                     const bookmarks::BookmarkNode* node,
                      NSMenu* menu,
                      bool enabled);
 
   // This configures an NSMenuItem with all the data from a BookmarkNode. This
   // is used to update existing menu items, as well as to configure newly
   // created ones, like in AddNodeToMenu().
   // |set_title| is optional since it is only needed when we get a
   // node changed notification.  On initial build of the menu we set
   // the title as part of alloc/init.
-  void ConfigureMenuItem(const BookmarkNode* node, NSMenuItem* item,
+  void ConfigureMenuItem(const bookmarks::BookmarkNode* node,
+                         NSMenuItem* item,
                          bool set_title);
 
   // Returns the NSMenuItem for a given BookmarkNode.
-  NSMenuItem* MenuItemForNode(const BookmarkNode* node);
+  NSMenuItem* MenuItemForNode(const bookmarks::BookmarkNode* node);
 
   // 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_;
 
   Profile* profile_;  // weak
   BookmarkMenuCocoaController* controller_;  // strong
 
   // The folder image so we can use one copy for all.
   base::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_;
+  std::map<const bookmarks::BookmarkNode*, NSMenuItem*> bookmark_nodes_;
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_