bookmarks: Move BookmarkModel into 'bookmarks' namespace.
BUG=370433
TEST=unit_tests, components_unittests
[email protected]
[email protected] (for components/policy)
Review URL: https://codereview.chromium.org/820603005
Cr-Commit-Position: refs/heads/master@{#311074}
diff --git a/components/enhanced_bookmarks/metadata_accessor.h b/components/enhanced_bookmarks/metadata_accessor.h
index 313705b4..884a0e72 100644
--- a/components/enhanced_bookmarks/metadata_accessor.h
+++ b/components/enhanced_bookmarks/metadata_accessor.h
@@ -9,10 +9,13 @@
#include <string>
#include <vector>
-class BookmarkModel;
class BookmarkNode;
class GURL;
+namespace bookmarks {
+class BookmarkModel;
+}
+
// TODO(rfevang): Remove this file once the remaining caller
// is converted (enhanced_bookmarks_bridge.cc)
@@ -32,11 +35,11 @@
// Returns the remoteId for a bookmark. If the bookmark doesn't have one already
// this function will create and set one.
-std::string RemoteIdFromBookmark(BookmarkModel* bookmark_model,
+std::string RemoteIdFromBookmark(bookmarks::BookmarkModel* bookmark_model,
const BookmarkNode* node);
// Sets the description of a bookmark.
-void SetDescriptionForBookmark(BookmarkModel* bookmark_model,
+void SetDescriptionForBookmark(bookmarks::BookmarkModel* bookmark_model,
const BookmarkNode* node,
const std::string& description);
@@ -46,7 +49,7 @@
// 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(BookmarkModel* bookmark_model,
+bool SetOriginalImageForBookmark(bookmarks::BookmarkModel* bookmark_model,
const BookmarkNode* node,
const GURL& url,
int width,
@@ -74,7 +77,7 @@
// 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(BookmarkModel* bookmark_model,
+bool SetAllImagesForBookmark(bookmarks::BookmarkModel* bookmark_model,
const BookmarkNode* node,
const GURL& image_url,
int image_width,
