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

Unified Diff: components/enhanced_bookmarks/bookmark_server_search_service.h

Issue 563363002: Only set remote id during url node creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Dedup remote ids + server service changes Created 6 years, 3 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 934458ed0c576a12309dc20efa8fca20197b79b8..b9ebb10a6414dcc8db30abb82516a4cd45f5a33e 100644
--- a/components/enhanced_bookmarks/bookmark_server_search_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_search_service.h
@@ -8,22 +8,24 @@
#include <string>
#include <vector>
+#include "components/bookmarks/browser/base_bookmark_model_observer.h"
#include "components/enhanced_bookmarks/bookmark_server_service.h"
#include "net/url_request/url_fetcher.h"
-class BookmarkModel;
-
namespace enhanced_bookmarks {
+class EnhancedBookmarkModel;
+
// Sends requests to the bookmark server to search for bookmarks relevant to a
// given query. Will handle one outgoing request at a time.
-class BookmarkServerSearchService : public BookmarkServerService {
+class BookmarkServerSearchService : public BookmarkServerService,
+ public BaseBookmarkModelObserver {
public:
BookmarkServerSearchService(
scoped_refptr<net::URLRequestContextGetter> request_context_getter,
ProfileOAuth2TokenService* token_service,
SigninManagerBase* signin_manager,
- BookmarkModel* bookmark_model);
+ EnhancedBookmarkModel* bookmark_model);
virtual ~BookmarkServerSearchService();
// Triggers a search. The query must not be empty. A call to this method
@@ -45,7 +47,8 @@ class BookmarkServerSearchService : public BookmarkServerService {
virtual void CleanAfterFailure() OVERRIDE;
- // BookmarkModelObserver methods.
+ // BaseBookmarkModelObserver methods.
+ virtual void BookmarkModelChanged() OVERRIDE{};
virtual void BookmarkNodeAdded(BookmarkModel* model,
const BookmarkNode* parent,
int index) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698