Split OfflinePageSuggestions into two categories

components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h

 // 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_OFFLINE_PAGES_OFFLINE_PAGE_SUGGESTIONS_PROVIDER_H_
 #define COMPONENTS_NTP_SNIPPETS_OFFLINE_PAGES_OFFLINE_PAGE_SUGGESTIONS_PROVIDER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 namespace ntp_snippets {
 
 // Provides content suggestions from the offline pages model.
 // Currently, those are only the pages that the user last navigated to in an
 // open tab and offlined bookmarks.
 class OfflinePageSuggestionsProvider
     : public ContentSuggestionsProvider,
       public offline_pages::OfflinePageModel::Observer {
  public:
   OfflinePageSuggestionsProvider(
+      bool recent_tabs_enabled,
+      bool downloads_enabled,
       ContentSuggestionsProvider::Observer* observer,
       CategoryFactory* category_factory,
       offline_pages::OfflinePageModel* offline_page_model,
       PrefService* pref_service);
   ~OfflinePageSuggestionsProvider() override;
 
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
  private:
   // ContentSuggestionsProvider implementation.
@@ skipping 14 matching lines @@
   void OfflinePageDeleted(int64_t offline_id,
                           const offline_pages::ClientId& client_id) override;
 
   // Queries the OfflinePageModel for offline pages.
   void FetchOfflinePages();
 
   // Callback from the OfflinePageModel.
   void OnOfflinePagesLoaded(
       const offline_pages::MultipleOfflinePageItemResult& result);
 
-  // Updates the |category_status_| and notifies the |observer_|, if necessary.
-  void NotifyStatusChanged(CategoryStatus new_status);
+  // Updates the |category_status_| of the |category| and notifies the
+  // |observer_|, if necessary.
+  void NotifyStatusChanged(Category category, CategoryStatus new_status);
 
-  // Converts an OfflinePageItem to a ContentSuggestion.
+  // Converts an OfflinePageItem to a ContentSuggestion for the |category|.
   ContentSuggestion ConvertOfflinePage(
+      Category category,
       const offline_pages::OfflinePageItem& offline_page) const;
 
-  // Reads |dismissed_ids_| from the prefs.
-  void ReadDismissedIDsFromPrefs();
+  // Gets the |kMaxSuggestionsCount| most recently visited OfflinePageItems from
+  // the list, orders them by last visit date and converts them to
+  // ContentSuggestions for the |category|.
+  std::vector<ContentSuggestion> GetMostRecentlyVisited(
+      Category category,
+      std::vector<const offline_pages::OfflinePageItem*>* offline_page_items)
+      const;
 
-  // Writes |dismissed_ids_| to the prefs.
-  void StoreDismissedIDsToPrefs();
+  // Reads dismissed IDs from the pref with name |pref_name|.
+  std::set<std::string> ReadDismissedIDsFromPrefs(const std::string& pref_name);

[Marc Treib, 2016/08/12 09:21:14]

const?

[Philipp Keck, 2016/08/12 09:56:40]

Done.

 
-  CategoryStatus category_status_;
+  // Writes |dismissed_ids| to the pref with name |pref_name|.
+  void StoreDismissedIDsToPrefs(const std::string& pref_name,
+                                const std::set<std::string>& dismissed_ids);
+
+  CategoryStatus recent_tabs_status_;
+  CategoryStatus downloads_status_;
 
   offline_pages::OfflinePageModel* offline_page_model_;
 
-  const Category provided_category_;
+  const Category recent_tabs_category_;
+  const Category downloads_category_;
 
   PrefService* pref_service_;
 
-  std::set<std::string> dismissed_ids_;
+  std::set<std::string> dismissed_recent_tab_ids_;
+  std::set<std::string> dismissed_download_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageSuggestionsProvider);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_OFFLINE_PAGES_OFFLINE_PAGE_SUGGESTIONS_PROVIDER_H_