Add ContentSuggestionsCategoryFactory; Store categories as ints

components/ntp_snippets/content_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_CONTENT_SUGGESTIONS_PROVIDER_H_
 #define COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_PROVIDER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 48 matching lines @@
     // Called when the provider needs to shut down and will not deliver any
     // suggestions anymore.
     virtual void OnProviderShutdown(ContentSuggestionsProvider* provider) = 0;
   };
 
   // Sets an observer which is notified about changes to the available
   // suggestions, or removes it by passing a nullptr. The provider does not take
   // ownership of the observer and the observer must outlive this provider.
   virtual void SetObserver(Observer* observer) = 0;
 
+  // Returns the categories provided by this provider.
+  // TODO(pke): "The value returned by this getter must not change unless
+  // OnXxx is called on the observer."
+  virtual std::vector<ContentSuggestionsCategory> provided_categories() = 0;

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

GetProvidedCategories - let's use hacker_style methods as rarely as possible :)

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

Done.

+
   // Determines the status of the given |category|, see
   // ContentSuggestionsCategoryStatus.
   virtual ContentSuggestionsCategoryStatus GetCategoryStatus(
       ContentSuggestionsCategory category) = 0;
 
   // Dismisses the suggestion with the given ID. A provider needs to ensure that
   // a once-dismissed suggestion is never delivered again (through the
   // Observer). The provider must not call Observer::OnSuggestionsChanged if the
   // removal of the dismissed suggestion is the only change.
   virtual void DismissSuggestion(const std::string& suggestion_id) = 0;
 
   // Fetches the image for the suggestion with the given ID and returns it
   // through the callback. This fetch may occur locally or from the internet.
   // If that suggestion doesn't exist, doesn't have an image or if the fetch
   // fails, the callback gets a null image.
   virtual void FetchSuggestionImage(const std::string& suggestion_id,
                                     const ImageFetchedCallback& callback) = 0;
 
   // Used only for debugging purposes. Clears all caches so that the next
   // fetch starts from scratch.
   virtual void ClearCachedSuggestionsForDebugging() = 0;
 
   // Used only for debugging purposes. Clears the cache of dismissed
   // suggestions, if present, so that no suggestions are suppressed. This does
   // not necessarily make previously dismissed suggestions reappear, as they may
   // have been permanently deleted, depending on the provider implementation.
   virtual void ClearDismissedSuggestionsForDebugging() = 0;
 
-  const std::vector<ContentSuggestionsCategory>& provided_categories() const {
-    return provided_categories_;
-  }
-
  protected:
   ContentSuggestionsProvider(
-      const std::vector<ContentSuggestionsCategory>& provided_categories);
+      ContentSuggestionsCategoryFactory* category_factory);
   virtual ~ContentSuggestionsProvider();
 
   // Creates a unique ID. The given |within_category_id| must be unique among
   // all suggestion IDs from this provider for the given |category|. This method
   // combines it with the |category| to form an ID that is unique
   // application-wide, because this provider is the only one that provides
   // suggestions for that category.
-  static std::string MakeUniqueID(ContentSuggestionsCategory category,
-                                  const std::string& within_category_id);
+  std::string MakeUniqueID(ContentSuggestionsCategory category,
+                           const std::string& within_category_id);
   // Reverse functions for MakeUniqueID()
-  static ContentSuggestionsCategory GetCategoryFromUniqueID(
+  ContentSuggestionsCategory GetCategoryFromUniqueID(
       const std::string& unique_id);
-  static std::string GetWithinCategoryIDFromUniqueID(
-      const std::string& unique_id);
+  std::string GetWithinCategoryIDFromUniqueID(const std::string& unique_id);
 
- private:
-  const std::vector<ContentSuggestionsCategory> provided_categories_;
+  ContentSuggestionsCategoryFactory* category_factory_;

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

Non-private members aren't allowed. You'll have to make it private, and offer a
protected accessor.

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

Done.

 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_PROVIDER_H_