[ios] ContentSuggestions Section for Discover Feed

Adds a section in the ContentSuggestions collection view
which will later be populated by the Discover feed.

Bug: 1085419
Change-Id: I36d6c55a4c3041d730d7189cdf2074d6e66ac0ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2215302
Commit-Queue: Adam Trudeau-Arcaro <adamta@google.com>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773261}

ios/chrome/browser/ui/content_suggestions/BUILD.gn

@@ -28,6 +28,7 @@ source_set("content_suggestions") {
     "ntp_home_metrics.mm",
   ]
   deps = [
+    ":feature_flags",
     "//base",
     "//components/favicon/core",
     "//components/feed/core/shared_prefs:feed_shared_prefs",

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm

@@ -50,6 +50,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeMostVisited,
   ItemTypePromo,
   ItemTypeLearnMore,
+  ItemTypeDiscover,
   ItemTypeUnknown,
 };
 
@@ -62,6 +63,7 @@ typedef NS_ENUM(NSInteger, SectionIdentifier) {
   SectionIdentifierLogo,
   SectionIdentifierPromo,
   SectionIdentifierLearnMore,
+  SectionIdentifierDiscover,
   SectionIdentifierDefault,
 };
 
@@ -98,7 +100,8 @@ ItemType ItemTypeForInfo(ContentSuggestionsSectionInformation* info) {
       return ItemTypePromo;
     case ContentSuggestionsSectionLearnMore:
       return ItemTypeLearnMore;
-
+    case ContentSuggestionsSectionDiscover:
+      return ItemTypeDiscover;
     case ContentSuggestionsSectionLogo:
     case ContentSuggestionsSectionUnknown:
       return ItemTypeUnknown;
@@ -121,7 +124,8 @@ SectionIdentifier SectionIdentifierForInfo(
       return SectionIdentifierPromo;
     case ContentSuggestionsSectionLearnMore:
       return SectionIdentifierLearnMore;
-
+    case ContentSuggestionsSectionDiscover:
+      return SectionIdentifierDiscover;
     case ContentSuggestionsSectionUnknown:
       return SectionIdentifierDefault;
   }

ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm

@@ -29,6 +29,7 @@
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_commands.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.h"
+#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_provider.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_service_bridge_observer.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestion_identifier.h"
@@ -93,6 +94,9 @@ const NSInteger kMaxNumMostVisitedTiles = 4;
 // suggested content.
 @property(nonatomic, strong)
     ContentSuggestionsSectionInformation* learnMoreSectionInfo;
+// Section Info for the section containing the Discover feed.
+@property(nonatomic, strong)
+    ContentSuggestionsSectionInformation* discoverSectionInfo;
 // Whether the page impression has been recorded.
 @property(nonatomic, assign) BOOL recordedPageImpression;
 // The ContentSuggestionsService, serving suggestions.
@@ -152,6 +156,8 @@ const NSInteger kMaxNumMostVisitedTiles = 4;
 
     _learnMoreItem = [[ContentSuggestionsLearnMoreItem alloc] init];
 
+    _discoverSectionInfo = DiscoverSectionInformation();
+
     _notificationPromo = std::make_unique<NotificationPromoWhatsNew>(
         GetApplicationContext()->GetLocalState());
     _notificationPromo->Init();
@@ -221,6 +227,10 @@ const NSInteger kMaxNumMostVisitedTiles = 4;
 
   [sectionsInfo addObject:self.learnMoreSectionInfo];
 
+  if (IsDiscoverFeedEnabled()) {
+    [sectionsInfo addObject:self.discoverSectionInfo];
+  }
+
   return sectionsInfo;
 }
 

ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h

@@ -24,6 +24,7 @@ typedef NS_ENUM(NSInteger, ContentSuggestionsSectionID) {
   ContentSuggestionsSectionArticles,
   ContentSuggestionsSectionReadingList,
   ContentSuggestionsSectionLearnMore,
+  ContentSuggestionsSectionDiscover,
 
   // Do not use this. It will trigger a DCHECK.
   // Do not add value after this one.

ios/chrome/browser/ui/content_suggestions/mediator_util.h

@@ -60,6 +60,9 @@ ContentSuggestionsSectionInformation* MostVisitedSectionInformation();
 // Creates and returns a SectionInfo for the Learn More section.
 ContentSuggestionsSectionInformation* LearnMoreSectionInformation();
 
+// Creates and returns a SectionInfo for the Discover feed section.
+ContentSuggestionsSectionInformation* DiscoverSectionInformation();
+
 // Converts a ntp_tiles::NTPTile |tile| to a ContentSuggestionsMostVisitedItem
 // with a |sectionInfo|.
 ContentSuggestionsMostVisitedItem* ConvertNTPTile(

ios/chrome/browser/ui/content_suggestions/mediator_util.mm

@@ -132,6 +132,18 @@ ContentSuggestionsSectionInformation* LearnMoreSectionInformation() {
   return EmptySectionInfo(ContentSuggestionsSectionLearnMore);
 }
 
+ContentSuggestionsSectionInformation* DiscoverSectionInformation() {
+  ContentSuggestionsSectionInformation* sectionInfo =
+      [[ContentSuggestionsSectionInformation alloc]
+          initWithSectionID:ContentSuggestionsSectionDiscover];
+  sectionInfo.title = nil;
+  sectionInfo.footerTitle = nil;
+  sectionInfo.showIfEmpty = YES;
+  sectionInfo.layout = ContentSuggestionsSectionLayoutCustom;
+
+  return sectionInfo;
+}
+
 ContentSuggestionsMostVisitedItem* ConvertNTPTile(
     const ntp_tiles::NTPTile& tile,
     ContentSuggestionsSectionInformation* sectionInfo) {

ios/showcase/content_suggestions/sc_content_suggestions_data_source.mm

@@ -121,6 +121,7 @@ using CSCollectionViewItem = CollectionViewItem<SuggestedContent>;
     }
     case ContentSuggestionsSectionLogo:
     case ContentSuggestionsSectionPromo:
+    case ContentSuggestionsSectionDiscover:
     case ContentSuggestionsSectionUnknown:
       return @[];
   }