Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: components/enhanced_bookmarks/bookmark_server_search_service.h

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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
Index: components/enhanced_bookmarks/bookmark_server_search_service.h
diff --git a/components/enhanced_bookmarks/bookmark_server_search_service.h b/components/enhanced_bookmarks/bookmark_server_search_service.h
index f1784476c2d3cfae7a28c76cc66be2c58833e2b2..5b4c61996f1cc6d80107330d601e5e81f00dfb83 100644
--- a/components/enhanced_bookmarks/bookmark_server_search_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_search_service.h
@@ -40,7 +40,7 @@ class BookmarkServerSearchService : public BookmarkServerService {
// loading and no results have come to the client. Previously cancelled
// queries will not trigger onChange(), and this method will also return null
// for queries that have never been passed to Search() before.
- scoped_ptr<std::vector<const BookmarkNode*>> ResultForQuery(
+ scoped_ptr<std::vector<const bookmarks::BookmarkNode*>> ResultForQuery(
const std::string& query);
protected:
@@ -53,11 +53,12 @@ class BookmarkServerSearchService : public BookmarkServerService {
// 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;
@@ -70,6 +71,7 @@ class BookmarkServerSearchService : public BookmarkServerService {
std::string current_query_;
DISALLOW_COPY_AND_ASSIGN(BookmarkServerSearchService);
};
+
} // namespace enhanced_bookmarks
#endif // COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_SERVER_SEARCH_SERVICE_H_

Powered by Google App Engine
This is Rietveld 408576698