bookmarks: Move BookmarkNode into 'bookmarks' namespace.

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
index 778127ec5433321efd2c8dab62fe208c36099d47..f168282fa9536810cea5f308a87e5f1f903acff2 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -26,13 +26,16 @@
 #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:
@@ -44,26 +47,27 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
                            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;
@@ -97,7 +101,7 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
   // 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);
 
@@ -106,7 +110,8 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
   // 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
@@ -114,7 +119,7 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
   // 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);
 
@@ -124,11 +129,12 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
   // |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();
@@ -147,7 +153,7 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver,
 
   // 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_