bookmarks: Move BookmarkNode into 'bookmarks' namespace.

chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_
 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 class BookmarkContextMenuControllerDelegate {
  public:
   virtual ~BookmarkContextMenuControllerDelegate() {}
 
   // Closes the bookmark context menu.
   virtual void CloseMenu() = 0;
 
   // Sent before any command from the menu is executed.
   virtual void WillExecuteCommand(
       int command_id,
-      const std::vector<const BookmarkNode*>& bookmarks) {}
+      const std::vector<const bookmarks::BookmarkNode*>& bookmarks) {}
 
   // Sent after any command from the menu is executed.
   virtual void DidExecuteCommand(int command_id) {}
 };
 
 // BookmarkContextMenuController creates and manages state for the context menu
 // shown for any bookmark item.
 class BookmarkContextMenuController
     : public bookmarks::BaseBookmarkModelObserver,
       public ui::SimpleMenuModel::Delegate {
  public:
   // Creates the bookmark context menu.
   // |browser| is used to open the bookmark manager and is NULL in tests.
   // |profile| is used for opening urls as well as enabling 'open incognito'.
   // |navigator| is used if |browser| is null, and is provided for testing.
   // |parent| is the parent for newly created nodes if |selection| is empty.
   // |selection| is the nodes the context menu operates on and may be empty.
   BookmarkContextMenuController(
       gfx::NativeWindow parent_window,
       BookmarkContextMenuControllerDelegate* delegate,
       Browser* browser,
       Profile* profile,
       content::PageNavigator* navigator,
-      const BookmarkNode* parent,
-      const std::vector<const BookmarkNode*>& selection);
+      const bookmarks::BookmarkNode* parent,
+      const std::vector<const bookmarks::BookmarkNode*>& selection);
   ~BookmarkContextMenuController() override;
 
   ui::SimpleMenuModel* menu_model() { return menu_model_.get(); }
 
   // ui::SimpleMenuModel::Delegate implementation:
   bool IsCommandIdChecked(int command_id) const override;
   bool IsCommandIdEnabled(int command_id) const override;
   bool IsCommandIdVisible(int command_id) const override;
   bool GetAcceleratorForCommandId(int command_id,
                                   ui::Accelerator* accelerator) override;
@@ skipping 17 matching lines @@
 
   // Overridden from bookmarks::BaseBookmarkModelObserver:
   // Any change to the model results in closing the menu.
   void BookmarkModelChanged() override;
 
   gfx::NativeWindow parent_window_;
   BookmarkContextMenuControllerDelegate* delegate_;
   Browser* browser_;
   Profile* profile_;
   content::PageNavigator* navigator_;
-  const BookmarkNode* parent_;
-  std::vector<const BookmarkNode*> selection_;
+  const bookmarks::BookmarkNode* parent_;
+  std::vector<const bookmarks::BookmarkNode*> selection_;
   bookmarks::BookmarkModel* model_;
   scoped_ptr<ui::SimpleMenuModel> menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuController);
 };
 
 #endif  // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_