| 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..40b4a0b612f66719cf869878bdf1fb2e51ec1285 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_
|
| +
|
|
|