Add ContentSuggestionsCategoryFactory; Store categories as ints

components/ntp_snippets/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_NTP_SNIPPETS_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "components/image_fetcher/image_fetcher_delegate.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_category.h"
+#include "components/ntp_snippets/content_suggestions_category_factory.h"
 #include "components/ntp_snippets/content_suggestions_category_status.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
 #include "components/ntp_snippets/ntp_snippet.h"
 #include "components/ntp_snippets/ntp_snippets_fetcher.h"
 #include "components/ntp_snippets/ntp_snippets_scheduler.h"
 #include "components/ntp_snippets/ntp_snippets_status_service.h"
 #include "components/suggestions/suggestions_service.h"
 #include "components/sync_driver/sync_service_observer.h"
 
 class PrefRegistrySimple;
@@ skipping 41 matching lines @@
   // (British English person in the US) are not language codes.
   NTPSnippetsService(bool enabled,
                      PrefService* pref_service,
                      suggestions::SuggestionsService* suggestions_service,
                      const std::string& application_language_code,
                      NTPSnippetsScheduler* scheduler,
                      std::unique_ptr<NTPSnippetsFetcher> snippets_fetcher,
                      std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher,
                      std::unique_ptr<image_fetcher::ImageDecoder> image_decoder,
                      std::unique_ptr<NTPSnippetsDatabase> database,
-                     std::unique_ptr<NTPSnippetsStatusService> status_service);
+                     std::unique_ptr<NTPSnippetsStatusService> status_service,
+                     ContentSuggestionsCategoryFactory* category_factory);

[Marc Treib, 2016/07/28 11:41:46]

I'd move this up to the other non-owned things, after suggestions_service.

[Philipp Keck, 2016/07/28 13:50:55]

Done.

 
   ~NTPSnippetsService() override;
 
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   // Inherited from KeyedService.
   void Shutdown() override;
 
   // Returns whether the service is ready. While this is false, the list of
   // snippets will be empty, and all modifications to it (fetch, dismiss, etc)
@@ skipping 36 matching lines @@
     return snippets_status_service_->disabled_reason();
   }
 
   // (Re)schedules the periodic fetching of snippets. This is necessary because
   // the schedule depends on the time of day.
   void RescheduleFetching();
 
   // ContentSuggestionsProvider implementation
   // TODO(pke): At some point reorder the implementations in the .cc file
   // accordingly.
+  std::vector<ContentSuggestionsCategory> provided_categories() override;
   void SetObserver(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;
 
   // Returns the lists of suggestion hosts the snippets are restricted to.
@@ skipping 164 matching lines @@
   // The database for persisting snippets.
   std::unique_ptr<NTPSnippetsDatabase> database_;
 
   // The service that provides events and data about the signin and sync state.
   std::unique_ptr<NTPSnippetsStatusService> snippets_status_service_;
 
   // Set to true if FetchSnippets is called before the database has been loaded.
   // The fetch will be executed after the database load finishes.
   bool fetch_after_load_;
 
+  ContentSuggestionsCategory provided_category_;

[Marc Treib, 2016/07/28 11:41:46]

const?

[Philipp Keck, 2016/07/28 13:50:55]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsService);
 };
 
 // TODO(pke): Remove this when snippets internals don't access this service
 // directly anymore.
 class NTPSnippetsServiceObserver {
  public:
   // Sent every time the service loads a new set of data.
   virtual void NTPSnippetsServiceLoaded() = 0;
 
   // Sent when the service is shutting down.
   virtual void NTPSnippetsServiceShutdown() = 0;
 
   // Sent when the state of the service is changing. Something changed in its
   // dependencies so it's notifying observers about incoming data changes.
   // If the service might be enabled, DisabledReason::NONE will be provided.
   virtual void NTPSnippetsServiceDisabledReasonChanged(DisabledReason) = 0;
 
  protected:
   virtual ~NTPSnippetsServiceObserver() {}
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_