| Index: components/ntp_snippets/content_suggestion.h
|
| diff --git a/components/ntp_snippets/content_suggestion.h b/components/ntp_snippets/content_suggestion.h
|
| index 60ab27285d39153f84cbc3440fa5346646f6a7d5..033cfef6d9e9e98cc1b3ec0a4012728dfcb5e3a7 100644
|
| --- a/components/ntp_snippets/content_suggestion.h
|
| +++ b/components/ntp_snippets/content_suggestion.h
|
| @@ -12,7 +12,6 @@
|
| #include "base/macros.h"
|
| #include "base/time/time.h"
|
| #include "components/ntp_snippets/content_suggestion_category.h"
|
| -#include "components/ntp_snippets/content_suggestions_provider_type.h"
|
| #include "url/gurl.h"
|
|
|
| namespace ntp_snippets {
|
| @@ -23,21 +22,22 @@ namespace ntp_snippets {
|
| // (see ntp_snippet.h).
|
| class ContentSuggestion {
|
| public:
|
| + // This is the constructor that should be used by providers.
|
| + // The caller must ensure that the |id| passed in here is unique
|
| + // application-wide. Note: The provider should use its ::MakeUniqueID()
|
| + // function to create the ID.
|
| ContentSuggestion(const std::string& id,
|
| - const ContentSuggestionsProviderType provider,
|
| const ContentSuggestionCategory category,
|
| const GURL& url);
|
| + ContentSuggestion(ContentSuggestion&&);
|
| + ContentSuggestion& operator=(ContentSuggestion&&);
|
|
|
| ~ContentSuggestion();
|
|
|
| // An ID for identifying the suggestion. The ID is unique among all
|
| - // suggestions from the same provider, so to determine a globally unique
|
| - // identifier, combine this ID with the provider type.
|
| + // suggestions of all providers.
|
| const std::string& id() const { return id_; }
|
|
|
| - // The provider that created this suggestion.
|
| - ContentSuggestionsProviderType provider() const { return provider_; }
|
| -
|
| // The category that this suggestion belongs to.
|
| ContentSuggestionCategory category() const { return category_; }
|
|
|
| @@ -82,7 +82,6 @@ class ContentSuggestion {
|
|
|
| private:
|
| std::string id_;
|
| - ContentSuggestionsProviderType provider_;
|
| ContentSuggestionCategory category_;
|
| GURL url_;
|
| GURL amp_url_;
|
|
|