components/enhanced_bookmarks/bookmark_server_cluster_service.h - Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/enhanced_bookmarks/bookmark_server_cluster_service.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

« components/enhanced_bookmarks/bookmark_image_service.h ('K') | « components/enhanced_bookmarks/bookmark_image_service.cc ('k') | components/enhanced_bookmarks/bookmark_server_cluster_service.cc » ('j') | components/enhanced_bookmarks/bookmark_server_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/enhanced_bookmarks/bookmark_server_cluster_service.h

diff --git a/components/enhanced_bookmarks/bookmark_server_cluster_service.h b/components/enhanced_bookmarks/bookmark_server_cluster_service.h

index cc3ae513602fd38ae4d239b79aad2b35f2afd8cf..6c2a678de03c2fbfa757bb7449ba90d5342972d6 100644

--- a/components/enhanced_bookmarks/bookmark_server_cluster_service.h

+++ b/components/enhanced_bookmarks/bookmark_server_cluster_service.h

@@ -43,12 +43,12 @@ class BookmarkServerClusterService : public KeyedService,

// Retrieves all the bookmarks associated with a cluster. The returned

// BookmarkNodes are owned by the bookmark model, and one must listen to the

// model observer notification to clear them.

- const std::vector<const BookmarkNode*> BookmarksForClusterNamed(

+ const std::vector<const bookmarks::BookmarkNode*> BookmarksForClusterNamed(

const std::string& cluster_name) const;

// Returns the clusters in which the passed bookmark is in, if any.

const std::vector<std::string> ClustersForBookmark(

- const BookmarkNode* bookmark) const;

+ const bookmarks::BookmarkNode* bookmark) const;

// Dynamically generates a vector of all clusters names.

const std::vector<std::string> GetClusters() const;

@@ -65,11 +65,12 @@ class BookmarkServerClusterService : public KeyedService,

// EnhancedBookmarkModelObserver methods.

void EnhancedBookmarkModelLoaded() override;

- void EnhancedBookmarkAdded(const BookmarkNode* node) override;

- void EnhancedBookmarkRemoved(const BookmarkNode* node) override;

- void EnhancedBookmarkNodeChanged(const BookmarkNode* node) override;

+ void EnhancedBookmarkAdded(const bookmarks::BookmarkNode* node) override;

+ void EnhancedBookmarkRemoved(const bookmarks::BookmarkNode* node) override;

+ void EnhancedBookmarkNodeChanged(

+ const bookmarks::BookmarkNode* node) override;

void EnhancedBookmarkAllUserNodesRemoved() override;

- void EnhancedBookmarkRemoteIdChanged(const BookmarkNode* node,

+ void EnhancedBookmarkRemoteIdChanged(const bookmarks::BookmarkNode* node,

const std::string& old_remote_id,

const std::string& remote_id) override;