Add bookmark provider for content suggestions

components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h

Index: components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h
diff --git a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1451f8ad4c37bf823300fb876e783c19a6df357
--- /dev/null
+++ b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h
@@ -0,0 +1,102 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_NTP_SNIPPETS_BOOKMARKS_BOOKMARK_SUGGESTIONS_PROVIDER_H_
+#define COMPONENTS_NTP_SNIPPETS_BOOKMARKS_BOOKMARK_SUGGESTIONS_PROVIDER_H_
+
+#include <set>
+#include <string>
+
+#include "components/bookmarks/browser/bookmark_model_observer.h"
+#include "components/keyed_service/core/keyed_service.h"
+#include "components/ntp_snippets/content_suggestions_category.h"
+#include "components/ntp_snippets/content_suggestions_category_status.h"
+#include "components/ntp_snippets/content_suggestions_provider.h"
+
+namespace gfx {
+class Image;
+}
+
+using bookmarks::BookmarkModel;
+using bookmarks::BookmarkNode;

[Marc Treib, 2016/07/29 10:08:35]

No using in headers

[jkrcal, 2016/07/29 13:57:17]

Done.

+
+namespace ntp_snippets {
+
+// Provides content suggestions from the bookmarks model.
+class BookmarkSuggestionsProvider : public KeyedService,
+                                    public ContentSuggestionsProvider,
+                                    public bookmarks::BookmarkModelObserver {
+ public:
+  explicit BookmarkSuggestionsProvider(
+      bookmarks::BookmarkModel* bookmark_model);
+  ~BookmarkSuggestionsProvider() override;
+
+  // Inherited from KeyedService.
+  void Shutdown() override;
+
+ private:
+  // ContentSuggestionsProvider implementation.
+  void SetObserver(ContentSuggestionsProvider::Observer* observer) override;
+  ContentSuggestionsCategoryStatus GetCategoryStatus(
+      ContentSuggestionsCategory category) override;
+  void DismissSuggestion(const std::string& suggestion_id) override;
+  void FetchSuggestionImage(const std::string& suggestion_id,
+                            const ImageFetchedCallback& callback) override;
+  void ClearCachedSuggestionsForDebugging() override;
+  void ClearDismissedSuggestionsForDebugging() override;
+
+  // bookmarks::BookmarkModelObserver implementation.
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
+  void OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
+                                    const BookmarkNode* node) override;
+  void BookmarkMetaInfoChanged(BookmarkModel* model,
+                               const BookmarkNode* node) override;
+
+  void BookmarkNodeMoved(BookmarkModel* model,
+                         const BookmarkNode* old_parent,
+                         int old_index,
+                         const BookmarkNode* new_parent,
+                         int new_index) override {}
+  void BookmarkNodeAdded(BookmarkModel* model,
+                         const BookmarkNode* parent,
+                         int index) override {}
+  void BookmarkNodeRemoved(
+      BookmarkModel* model,
+      const BookmarkNode* parent,
+      int old_index,
+      const BookmarkNode* node,
+      const std::set<GURL>& no_longer_bookmarked) override {}
+  void BookmarkNodeChanged(BookmarkModel* model,
+                           const BookmarkNode* node) override {}
+  void BookmarkNodeFaviconChanged(BookmarkModel* model,
+                                  const BookmarkNode* node) override {}
+  void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                     const BookmarkNode* node) override {}
+  void BookmarkAllUserNodesRemoved(
+      BookmarkModel* model,
+      const std::set<GURL>& removed_urls) override {}
+
+  // Queries the BookmarkModel for recently visited bookmarks.
+  void FetchBookmarksWhenLoaded();

[Bernhard Bauer, 2016/07/29 10:28:51]

This method is meant to be called when the bookmark model has been loaded,
right? Right now it reads more like it's qualifying the imperative (fetch
bookmarks when the model has been loaded, i.e. what the _current_
FetchBookmarks() does). Maybe FetchBookmarksAfterLoading()? (Or just
FetchBookmarksInternal() and add a comment about the precondition, and maybe a
DCHECK for good measure?)

[jkrcal, 2016/07/29 13:57:17]

Good point, done.

+  // The entry point for fetching bookmarks - once the bookmark model is loaded,
+  // it calls FetchBookmarksWhenLoaded().
+  void FetchBookmarks();
+
+  // Updates the |category_status_| and notifies the |observer_|, if necessary.
+  void NotifyStatusChanged(ContentSuggestionsCategoryStatus new_status);
+
+  ContentSuggestionsCategoryStatus category_status_;
+  ContentSuggestionsProvider::Observer* observer_;
+  BookmarkModel* bookmark_model_;
+  bool fetch_requested_;
+
+  base::Time node_to_change_last_visit_date_;
+  base::Time end_of_list_last_visit_date_;
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkSuggestionsProvider);
+};
+
+}  // namespace ntp_snippets
+
+#endif  // COMPONENTS_NTP_SNIPPETS_BOOKMARKS_BOOKMARK_SUGGESTIONS_PROVIDER_H_