Add Most Visited tiles to ContentSuggestions

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

 // 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.
 
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/time/time.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_article_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_footer_item.h"
+#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited.h"
+#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_reading_list_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_text_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_source.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_image_fetcher.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestion_identifier.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h"
 #import "ios/chrome/browser/ui/favicon/favicon_attributes.h"
@@ skipping 203 matching lines @@
     (CollectionViewItem*)item {
   return ContentSuggestionTypeForItemType(item.type);
 }
 
 - (NSArray<NSIndexPath*>*)addSuggestionsToModel:
     (NSArray<ContentSuggestion*>*)suggestions {
   if (suggestions.count == 0) {
     return [NSArray array];
   }
 
+  NSMutableArray<ContentSuggestionsMostVisited*>* mostVisitedToAdd =
+      [NSMutableArray array];
+
+  CSCollectionViewModel* model =
+      self.collectionViewController.collectionViewModel;
   NSMutableArray<NSIndexPath*>* indexPaths = [NSMutableArray array];
   for (ContentSuggestion* suggestion in suggestions) {
     ContentSuggestionsSectionInformation* sectionInfo =
         suggestion.suggestionIdentifier.sectionInfo;
     NSInteger sectionIdentifier = SectionIdentifierForInfo(sectionInfo);
-    CSCollectionViewModel* model =
-        self.collectionViewController.collectionViewModel;
 
     if (![model hasSectionForSectionIdentifier:sectionIdentifier])
-      return [NSArray array];
+      continue;
 
     NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
     NSIndexPath* indexPath = [NSIndexPath indexPathForItem:0 inSection:section];
 
     if (suggestion.type != ContentSuggestionTypeEmpty &&
         [model hasItemAtIndexPath:indexPath] &&
         [model itemAtIndexPath:indexPath].type == ItemTypeEmpty) {
       [self.collectionViewController dismissEntryAtIndexPath:indexPath];
     }
 
@@ skipping 22 matching lines @@
       case ContentSuggestionTypeReadingList: {
         ContentSuggestionsReadingListItem* readingListItem =
             [self readingListItemForSuggestion:suggestion];
 
         NSIndexPath* addedIndexPath = [self addItem:readingListItem
                             toSectionWithIdentifier:sectionIdentifier];
         [indexPaths addObject:addedIndexPath];
         break;
       }
       case ContentSuggestionTypeMostVisited: {
+        NSInteger section =
+            [model sectionForSectionIdentifier:SectionIdentifierMostVisited];
+        NSIndexPath* indexPath =
+            [NSIndexPath indexPathForItem:0 inSection:section];
+
+        if ([model numberOfItemsInSection:section] == 0) {
+          [model addItem:[[ContentSuggestionsMostVisitedItem alloc]
+                             initWithType:ItemTypeMostVisited]
+              toSectionWithIdentifier:SectionIdentifierMostVisited];
+          [indexPaths addObject:indexPath];
+        }
+
+        ContentSuggestionsMostVisited* mostVisited =
+            [ContentSuggestionsMostVisited mostVisitedWithTitle:suggestion.title
+                                                     attributes:nil];
+        [mostVisitedToAdd addObject:mostVisited];
         // TODO(crbug.com/707754): Add the most visited item.

[lpromero, 2017/05/05 15:08:25]

Remove.

[gambard, 2017/05/05 15:24:52]

Done.

         break;
       }
     }
   }
 
+  NSInteger section =
+      [model sectionForSectionIdentifier:SectionIdentifierMostVisited];
+  NSIndexPath* indexPath = [NSIndexPath indexPathForItem:0 inSection:section];
+  ContentSuggestionsMostVisitedItem* item =
+      (ContentSuggestionsMostVisitedItem*)[model itemAtIndexPath:indexPath];

[lpromero, 2017/05/05 15:08:25]

base::mac::ObjCCast<ContentSuggestionsMostVisitedItem>?

[gambard, 2017/05/05 15:24:52]

Done.

+  item.suggestions = mostVisitedToAdd;
+
+  [self.collectionViewController.collectionViewLayout invalidateLayout];

[lpromero, 2017/05/05 15:08:24]

I don't think this belongs in this method. If necessary it should be done at the
callsite.

[gambard, 2017/05/05 15:24:52]

Done.

+
   return indexPaths;
 }
 
 - (NSIndexSet*)addSectionsForSuggestionsToModel:
     (NSArray<ContentSuggestion*>*)suggestions {
   NSMutableIndexSet* indexSet = [NSMutableIndexSet indexSet];
 
   CSCollectionViewModel* model =
       self.collectionViewController.collectionViewModel;
   for (ContentSuggestion* suggestion in suggestions) {
@@ skipping 245 matching lines @@
         [model sectionIdentifierForSection:sectionNumber];
     if ([model hasItem:item inSectionWithIdentifier:sectionIdentifier]) {
       [self.collectionViewController
           reconfigureCellsForItems:@[ item ]
            inSectionWithIdentifier:sectionIdentifier];
     }
   }
 }
 
 @end