Identify MostVisited by item instead of URL

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_item+collection_view_controller.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_footer_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_text_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/suggested_content.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"
 #include "ui/base/l10n/l10n_util.h"
-#include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 
 using CSCollectionViewItem = CollectionViewItem<SuggestedContent>;
 using CSCollectionViewModel = CollectionViewModel<CSCollectionViewItem*>;
 
@@ skipping 172 matching lines @@
   NSInteger section = [self.collectionViewController.collectionViewModel
       sectionIdentifierForSection:sectionIdentifier];
 
   [self.collectionViewController dismissSection:section];
 }
 
 - (void)reloadSection:(ContentSuggestionsSectionInformation*)sectionInfo {
   // TODO(crbug.com/707754): implement this method.
 }
 
-- (void)faviconAvailableForURL:(const GURL&)URL {
-  // TODO(crbug.com/707754): implement this method.
+- (void)faviconAvailableForItem:(CollectionViewItem<SuggestedContent>*)item {
+  if ([self.collectionViewController.collectionViewModel hasItem:item]) {
+    [self fetchFaviconForItem:item];
+  }
 }
 
 #pragma mark - Public methods
 
 - (BOOL)shouldUseCustomStyleForSection:(NSInteger)section {
   NSNumber* identifier = @([self.collectionViewController.collectionViewModel
       sectionIdentifierForSection:section]);
   ContentSuggestionsSectionInformation* sectionInformation =
       self.sectionInfoBySectionIdentifier[identifier];
   return sectionInformation.layout == ContentSuggestionsSectionLayoutCustom;
@@ skipping 184 matching lines @@
 - (void)fetchFaviconForItem:(CSCollectionViewItem*)item {
   __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
   __weak CSCollectionViewItem* weakItem = item;
 
   [self.dataSource
       fetchFaviconAttributesForItem:item
                          completion:^(FaviconAttributes* attributes) {
                            ContentSuggestionsCollectionUpdater* strongSelf =
                                weakSelf;
                            CSCollectionViewItem* strongItem = weakItem;
-                           if (!strongSelf || !strongItem) {
+                           if (!strongSelf || !strongItem)
                              return;
-                           }
 
-                           strongItem.attributes = attributes;
-                           [strongSelf.collectionViewController
-                               reconfigureCellsForItems:@[ strongItem ]];
+                           [strongSelf reconfigure:strongItem
+                                    withAttributes:attributes];
 
                            [strongSelf fetchFaviconImageForItem:strongItem];
                          }];
 }
 
 // Fetches the favicon image for the |item|.
 - (void)fetchFaviconImageForItem:(CSCollectionViewItem*)item {
   __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
   __weak CSCollectionViewItem* weakItem = item;
 
   [self.dataSource
       fetchFaviconImageForItem:item
                     completion:^(UIImage* image) {
-                      ContentSuggestionsCollectionUpdater* strongSelf =
-                          weakSelf;
-                      CSCollectionViewItem* strongItem = weakItem;
-                      if (!strongSelf || !strongItem || !image) {
-                        return;
-                      }
+                      [weakSelf reconfigure:weakItem
+                             withAttributes:[FaviconAttributes
+                                                attributesWithImage:image]];
+                    }];
+}
 
-                      strongItem.attributes =
-                          [FaviconAttributes attributesWithImage:image];
-                      [strongSelf.collectionViewController
-                          reconfigureCellsForItems:@[ strongItem ]];
-                    }];
+// Sets the attributes of |item| to |attributes| and reconfigure it.

[jif, 2017/05/17 13:13:28]

and reconfigures

[gambard, 2017/05/17 14:13:32]

Done.

+- (void)reconfigure:(CSCollectionViewItem*)item
+     withAttributes:(FaviconAttributes*)attributes {
+  if (!item || !attributes ||
+      ![self.collectionViewController.collectionViewModel hasItem:item]) {
+    return;
+  }
+
+  item.attributes = attributes;
+  [self.collectionViewController reconfigureCellsForItems:@[ item ]];
 }
 
 // Runs the additional action for the section identified by |sectionInfo|.
 - (void)runAdditionalActionForSection:
     (ContentSuggestionsSectionInformation*)sectionInfo {
   SectionIdentifier sectionIdentifier = SectionIdentifierForInfo(sectionInfo);
 
   // TODO(crbug.com/721229): Start spinner.
 
   NSMutableArray<ContentSuggestionIdentifier*>* knownSuggestionIdentifiers =
@@ skipping 50 matching lines @@
   CSCollectionViewModel* model =
       self.collectionViewController.collectionViewModel;
   NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
   NSInteger itemNumber = [model numberOfItemsInSection:section];
   [model addItem:item toSectionWithIdentifier:sectionIdentifier];
 
   return [NSIndexPath indexPathForItem:itemNumber inSection:section];
 }
 
 @end