bookmarks: Move BookmarkNode into 'bookmarks' namespace.

components/enhanced_bookmarks/enhanced_bookmark_utils.h

 // Copyright 2014 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 COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
-class BookmarkNode;
-
 namespace bookmarks {
 class BookmarkModel;
+class BookmarkNode;
 }
 
 namespace enhanced_bookmarks {
 
 // The vector is sorted in place.
 // All of the bookmarks in |nodes| must be urls.
-void SortBookmarksByName(std::vector<const BookmarkNode*>& nodes);
+void SortBookmarksByName(std::vector<const bookmarks::BookmarkNode*>& nodes);
 
 // Returns the permanent nodes whose url children are considered uncategorized
 // and whose folder children should be shown in the bookmark menu.
 // |model| must be loaded.
-std::vector<const BookmarkNode*> PrimaryPermanentNodes(
+std::vector<const bookmarks::BookmarkNode*> PrimaryPermanentNodes(
     bookmarks::BookmarkModel* model);
 
 // Returns an unsorted vector of folders that are considered to be at the "root"
 // level of the bookmark hierarchy. Functionally, this means all direct
 // descendants of PrimaryPermanentNodes.
-std::vector<const BookmarkNode*> RootLevelFolders(
+std::vector<const bookmarks::BookmarkNode*> RootLevelFolders(
     bookmarks::BookmarkModel* model);
 
 // Returns whether |node| is a primary permanent node in the sense of
 // |PrimaryPermanentNodes|.
-bool IsPrimaryPermanentNode(const BookmarkNode* node,
+bool IsPrimaryPermanentNode(const bookmarks::BookmarkNode* node,
                             bookmarks::BookmarkModel* model);
 
 // Returns the root level folder in which this node is directly, or indirectly
 // via subfolders, located.
-const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node,
-                                           bookmarks::BookmarkModel* model);
+const bookmarks::BookmarkNode* RootLevelFolderForNode(
+    const bookmarks::BookmarkNode* node,
+    bookmarks::BookmarkModel* model);
 
 }  // namespace enhanced_bookmarks
 
-#endif  // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_
+#endif  // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_/home/tfarina/chromium/src/buildtools/linux64/clang-format

[sky, 2015/02/03 17:08:37]

Fix this one too.

[tfarina, 2015/02/04 20:51:14]

Done.

+