| Index: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
|
| diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
|
| index 43557f0a8eb99f3e5e7529f6c37270bd009adcfa..e12850114ae2df565c06836fd80175b487567e22 100644
|
| --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
|
| +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
|
| @@ -11,11 +11,11 @@
|
| #include "base/basictypes.h"
|
| #include "chrome/common/extensions/api/bookmarks.h"
|
|
|
| -class BookmarkNode;
|
| class ChromeBookmarkClient;
|
|
|
| namespace bookmarks {
|
| class BookmarkModel;
|
| +class BookmarkNode;
|
| }
|
|
|
| // Helper functions.
|
| @@ -25,18 +25,18 @@ namespace bookmark_api_helpers {
|
| // The returned value is owned by the caller.
|
| api::bookmarks::BookmarkTreeNode* GetBookmarkTreeNode(
|
| ChromeBookmarkClient* client,
|
| - const BookmarkNode* node,
|
| + const bookmarks::BookmarkNode* node,
|
| bool recurse,
|
| bool only_folders);
|
|
|
| // Add a JSON representation of |node| to the JSON |nodes|.
|
| void AddNode(ChromeBookmarkClient* client,
|
| - const BookmarkNode* node,
|
| + const bookmarks::BookmarkNode* node,
|
| std::vector<linked_ptr<api::bookmarks::BookmarkTreeNode> >* nodes,
|
| bool recurse);
|
|
|
| void AddNodeFoldersOnly(ChromeBookmarkClient* client,
|
| - const BookmarkNode* node,
|
| + const bookmarks::BookmarkNode* node,
|
| std::vector<linked_ptr<
|
| api::bookmarks::BookmarkTreeNode> >* nodes,
|
| bool recurse);
|
| @@ -48,7 +48,7 @@ bool RemoveNode(bookmarks::BookmarkModel* model,
|
| std::string* error);
|
|
|
| // Get meta info from |node| and all it's children recursively.
|
| -void GetMetaInfo(const BookmarkNode& node,
|
| +void GetMetaInfo(const bookmarks::BookmarkNode& node,
|
| base::DictionaryValue* id_to_meta_info_map);
|
|
|
| } // namespace bookmark_api_helpers
|
|
|