Finalize backend for fetching more NTPSnippets.

components/ntp_snippets/remote/ntp_snippets_service.h

 // Copyright 2015 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_REMOTE_NTP_SNIPPETS_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPETS_SERVICE_H_
 
 #include <cstddef>
 #include <map>
 #include <memory>
@@ skipping 99 matching lines @@
   // tasks will be re-scheduled even if they already exist and have the correct
   // periods.
   void RescheduleFetching(bool force);
 
   // ContentSuggestionsProvider implementation
   CategoryStatus GetCategoryStatus(Category category) override;
   CategoryInfo GetCategoryInfo(Category category) override;
   void DismissSuggestion(const ContentSuggestion::ID& suggestion_id) override;
   void FetchSuggestionImage(const ContentSuggestion::ID& suggestion_id,
                             const ImageFetchedCallback& callback) override;
-  void FetchMore(const Category& category,
-                 FetchedMoreCallback callback) override;
+  void Fetch(const Category& category,
+             std::set<std::string> known_suggestion_ids,
+             FetchingCallback callback) override;
   void ClearHistory(
       base::Time begin,
       base::Time end,
       const base::Callback<bool(const GURL& url)>& filter) override;
   void ClearCachedSuggestions(Category category) override;
   void GetDismissedSuggestionsForDebugging(
       Category category,
       const DismissedSuggestionsCallback& callback) override;
   void ClearDismissedSuggestionsForDebugging(Category category) override;
 
@@ skipping 74 matching lines @@
   void OnImageDataFetched(const std::string& id_within_category,
                           const std::string& image_data) override;
 
   // Callbacks for the NTPSnippetsDatabase.
   void OnDatabaseLoaded(NTPSnippet::PtrVector snippets);
   void OnDatabaseError();
 
   // Callback for the NTPSnippetsFetcher.
   void OnFetchFinished(
       bool fetched_more,
-      FetchedMoreCallback fetched_more_callback,
+      FetchingCallback fetched_more_callback,
       NTPSnippetsFetcher::OptionalFetchedCategories fetched_categories);
 
   // Moves all snippets from |to_archive| into the archive of the |category|.
   // It also deletes the snippets from the DB and keeps the archive reasonably
   // short.
   void ArchiveSnippets(Category category, NTPSnippet::PtrVector* to_archive);
 
   // Adds newly available suggestions in |category| to the available ones.
   // If |replace_snippets| is set, archives existing suggestions.
   void IncludeSnippets(const Category& category,
@@ skipping 51 matching lines @@
   // Disables the service permanently because an unrecoverable error occurred.
   // Do not call directly, use |EnterState| instead.
   void EnterStateError();
 
   // Converts the cached snippets in the given |category| to content suggestions
   // and notifies the observer.
   void NotifyNewSuggestions(Category category);
 
   // Converts the cached snippets in the given |category| to content suggestions
   // and passes them to the |callback|.
-  void NotifyMoreSuggestions(Category category, FetchedMoreCallback callback);
+  void NotifyMoreSuggestions(Category category, FetchingCallback callback);
 
   // Updates the internal status for |category| to |category_status_| and
   // notifies the content suggestions observer if it changed.
   void UpdateCategoryStatus(Category category, CategoryStatus status);
   // Calls UpdateCategoryStatus() for all provided categories.
   void UpdateAllCategoryStatus(CategoryStatus status);
 
   void RestoreCategoriesFromPrefs();
   void StoreCategoriesToPrefs();
 
-  // Implementation for |FetchSnippets| and |FetchMore| that calls the snippet
+  // Implementation for |FetchSnippets| and |Fetch| that calls the snippet
   // fetcher and replaces or adds the fetched snippets depending on the
   // |fetch_more| parameter.
   void FetchSnippetsFromHostsImpl(const std::set<std::string>& hosts,
                                   bool interactive_request,
                                   bool fetch_more,
-                                  FetchedMoreCallback fetched_more_callback,
-                                  base::Optional<Category> exclusive_category);
+                                  std::set<std::string> known_suggestion_ids,
+                                  base::Optional<Category> exclusive_category,
+                                  FetchingCallback fetched_more_callback);
 
-  // Returns a set of snippet IDs that should not be fetcheds. These IDs always
+  // Returns a set of snippet IDs that should not be fetched. These IDs always
   // include dismissed snippets. If |fetch_more| is set, they include all known
   // snippet IDs.
-  std::set<std::string> CollectIdsToExclude(bool fetch_more) const;
+  std::set<std::string> CollectIdsToExclude(
+      bool fetch_more,
+      std::set<std::string> additional_ids) const;
 
   void MarkEmptyCategoriesAsLoading();
 
   State state_;
 
   PrefService* pref_service_;
 
   const Category articles_category_;
 
   // TODO(sfiera): Reduce duplication of CategoryContent with CategoryInfo.
@@ skipping 65 matching lines @@
 
   // Request throttler for limiting requests to thumbnail images.
   RequestThrottler thumbnail_requests_throttler_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsService);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPETS_SERVICE_H_