diff options
author | tfarina <tfarina@chromium.org> | 2015-02-04 14:10:50 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-04 22:11:54 +0000 |
commit | a665b308ea4c6c7e75f56a4c614d279c0d25e64a (patch) | |
tree | e2064c59c0b66758670b02b2b2984a518d79d219 /components/enhanced_bookmarks/metadata_accessor.h | |
parent | 6c46080bac609fe3df0701b403709559c8ff4b4e (diff) | |
download | chromium_src-a665b308ea4c6c7e75f56a4c614d279c0d25e64a.zip chromium_src-a665b308ea4c6c7e75f56a4c614d279c0d25e64a.tar.gz chromium_src-a665b308ea4c6c7e75f56a4c614d279c0d25e64a.tar.bz2 |
bookmarks: Move BookmarkNode into 'bookmarks' namespace.
BUG=370433
TEST=unit_tests, components_unittests
R=sky@chromium.org
TBR=joaodasilva@chromium.org (for policy)
Review URL: https://codereview.chromium.org/865163003
Cr-Commit-Position: refs/heads/master@{#314653}
Diffstat (limited to 'components/enhanced_bookmarks/metadata_accessor.h')
-rw-r--r-- | components/enhanced_bookmarks/metadata_accessor.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/components/enhanced_bookmarks/metadata_accessor.h b/components/enhanced_bookmarks/metadata_accessor.h index 884a0e7..dea97b2 100644 --- a/components/enhanced_bookmarks/metadata_accessor.h +++ b/components/enhanced_bookmarks/metadata_accessor.h @@ -9,11 +9,11 @@ #include <string> #include <vector> -class BookmarkNode; class GURL; namespace bookmarks { class BookmarkModel; +class BookmarkNode; } // TODO(rfevang): Remove this file once the remaining caller @@ -24,8 +24,8 @@ class BookmarkModel; // images and descriptions related to the url. namespace enhanced_bookmarks { -typedef std::vector<const BookmarkNode*> NodeVector; -typedef std::set<const BookmarkNode*> NodeSet; +typedef std::vector<const bookmarks::BookmarkNode*> NodeVector; +typedef std::set<const bookmarks::BookmarkNode*> NodeSet; // The keys used to store the data in the bookmarks metadata dictionary. extern const char* kPageDataKey; @@ -36,49 +36,49 @@ extern const char* kNoteKey; // Returns the remoteId for a bookmark. If the bookmark doesn't have one already // this function will create and set one. std::string RemoteIdFromBookmark(bookmarks::BookmarkModel* bookmark_model, - const BookmarkNode* node); + const bookmarks::BookmarkNode* node); // Sets the description of a bookmark. void SetDescriptionForBookmark(bookmarks::BookmarkModel* bookmark_model, - const BookmarkNode* node, + const bookmarks::BookmarkNode* node, const std::string& description); // Returns the description of a bookmark. -std::string DescriptionFromBookmark(const BookmarkNode* node); +std::string DescriptionFromBookmark(const bookmarks::BookmarkNode* node); // Sets the URL of an image representative of the page. // Expects the URL to be valid and not empty. // Returns true if the metainfo is successfully populated. bool SetOriginalImageForBookmark(bookmarks::BookmarkModel* bookmark_model, - const BookmarkNode* node, + const bookmarks::BookmarkNode* node, const GURL& url, int width, int height); // Returns the url and dimensions of the original scraped image. // Returns true if the out variables are populated, false otherwise. -bool OriginalImageFromBookmark(const BookmarkNode* node, +bool OriginalImageFromBookmark(const bookmarks::BookmarkNode* node, GURL* url, int* width, int* height); // Returns the url and dimensions of the server provided thumbnail image. // Returns true if the out variables are populated, false otherwise. -bool ThumbnailImageFromBookmark(const BookmarkNode* node, +bool ThumbnailImageFromBookmark(const bookmarks::BookmarkNode* node, GURL* url, int* width, int* height); // Returns a brief server provided synopsis of the bookmarked page. // Returns the empty string if the snippet could not be extracted. -std::string SnippetFromBookmark(const BookmarkNode* node); +std::string SnippetFromBookmark(const bookmarks::BookmarkNode* node); // Used for testing, simulates the process that creates the thumnails. Will // remove existing entries for empty urls or set them if the url is not empty. // expects valid or empty urls. Returns true if the metainfo is successfully // populated. bool SetAllImagesForBookmark(bookmarks::BookmarkModel* bookmark_model, - const BookmarkNode* node, + const bookmarks::BookmarkNode* node, const GURL& image_url, int image_width, int image_height, |