Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Unified Diff: components/enhanced_bookmarks/enhanced_bookmark_utils.h

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mac fixes Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/enhanced_bookmarks/enhanced_bookmark_utils.h
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.h b/components/enhanced_bookmarks/enhanced_bookmark_utils.h
index dc9cf3c85665fda96c7a4b5fef3b465e04ce0b46..326ef201de8ace7e2f99529335cc3ac3466e106c 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_utils.h
+++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.h
@@ -9,40 +9,41 @@
#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.
+

Powered by Google App Engine
This is Rietveld 408576698