bookmarks: Move BookmarkNode into 'bookmarks' namespace.

chrome/browser/ui/bookmarks/bookmark_utils.h

Index: chrome/browser/ui/bookmarks/bookmark_utils.h
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.h b/chrome/browser/ui/bookmarks/bookmark_utils.h
index b146f76629c70b6ade857429d1ac29a7e902a431..dbd7d0f732c9e478b609c6ed7a20ffaf7905d2d3 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.h
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.h
@@ -12,13 +12,13 @@
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/native_widget_types.h"
 
-class BookmarkNode;
 class Browser;
 class GURL;
 class PrefService;
 class Profile;
 
 namespace bookmarks {
+class BookmarkNode;
 struct BookmarkNodeData;
 }
 
@@ -28,11 +28,6 @@ class PageNavigator;
 class WebContents;
 }
 
-namespace extensions {
-class CommandService;
-class Extension;
-}
-
 namespace ui {
 class DropTargetEvent;
 }
@@ -52,19 +47,19 @@ extern int num_bookmark_urls_before_prompting;
 // background tabs. |navigator| is used to open the URLs.
 void OpenAll(gfx::NativeWindow parent,
              content::PageNavigator* navigator,
-             const std::vector<const BookmarkNode*>& nodes,
+             const std::vector<const bookmarks::BookmarkNode*>& nodes,
              WindowOpenDisposition initial_disposition,
              content::BrowserContext* browser_context);
 
 // Convenience for OpenAll() with a single BookmarkNode.
 void OpenAll(gfx::NativeWindow parent,
              content::PageNavigator* navigator,
-             const BookmarkNode* node,
+             const bookmarks::BookmarkNode* node,
              WindowOpenDisposition initial_disposition,
              content::BrowserContext* browser_context);
 
 // Asks the user before deleting a non-empty bookmark folder.
-bool ConfirmDeleteBookmarkNode(const BookmarkNode* node,
+bool ConfirmDeleteBookmarkNode(const bookmarks::BookmarkNode* node,
                                gfx::NativeWindow window);
 
 // Shows the bookmark all tabs dialog.
@@ -72,12 +67,13 @@ void ShowBookmarkAllTabsDialog(Browser* browser);
 
 // Returns true if OpenAll() can open at least one bookmark of type url
 // in |selection|.
-bool HasBookmarkURLs(const std::vector<const BookmarkNode*>& selection);
+bool HasBookmarkURLs(
+    const std::vector<const bookmarks::BookmarkNode*>& selection);
 
 // Returns true if OpenAll() can open at least one bookmark of type url
 // in |selection| with incognito mode.
 bool HasBookmarkURLsAllowedInIncognitoMode(
-    const std::vector<const BookmarkNode*>& selection,
+    const std::vector<const bookmarks::BookmarkNode*>& selection,
     content::BrowserContext* browser_context);
 
 // Returns the bookmarkable URL for |web_contents|.
@@ -124,7 +120,7 @@ bool ShouldRemoveBookmarkOpenPagesUI(Profile* profile);
 
 // Returns the drag operations for the specified node.
 int GetBookmarkDragOperation(content::BrowserContext* browser_context,
-                             const BookmarkNode* node);
+                             const bookmarks::BookmarkNode* node);
 
 // Calculates the drop operation given |source_operations| and the ideal
 // set of drop operations (|operations|). This prefers the following ordering:
@@ -137,7 +133,7 @@ int GetPreferredBookmarkDropOperation(int source_operations, int operations);
 int GetBookmarkDropOperation(Profile* profile,
                              const ui::DropTargetEvent& event,
                              const bookmarks::BookmarkNodeData& data,
-                             const BookmarkNode* parent,
+                             const bookmarks::BookmarkNode* parent,
                              int index);
 
 // Returns true if the bookmark data can be dropped on |drop_parent| at
@@ -147,7 +143,7 @@ int GetBookmarkDropOperation(Profile* profile,
 // a child of |drop_parent| at |index|.
 bool IsValidBookmarkDropLocation(Profile* profile,
                                  const bookmarks::BookmarkNodeData& data,
-                                 const BookmarkNode* drop_parent,
+                                 const bookmarks::BookmarkNode* drop_parent,
                                  int index);
 
 }  // namespace chrome