Open Reading List on tap on More

ios/chrome/browser/content_suggestions/content_suggestions_mediator.mm

 // Copyright 2017 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/content_suggestions/content_suggestions_mediator.h"
 
 #include "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/favicon/core/large_icon_service.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_category_wrapper.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_service_bridge_observer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
+#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_image_fetcher.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_provider.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ skipping 135 matching lines @@
     (ContentSuggestionsSectionInformation*)sectionInfo;
 
 @end
 
 @implementation ContentSuggestionsMediator
 
 @synthesize contentService = _contentService;
 @synthesize dataSink = _dataSink;
 @synthesize sectionInformationByCategory = _sectionInformationByCategory;
 @synthesize attributesProvider = _attributesProvider;
+@synthesize commandHandler = _commandHandler;
 
 #pragma mark - Public
 
 - (instancetype)
 initWithContentService:(ntp_snippets::ContentSuggestionsService*)contentService
       largeIconService:(favicon::LargeIconService*)largeIconService {
   self = [super init];
   if (self) {
     _suggestionBridge =
         base::MakeUnique<ContentSuggestionsServiceBridge>(self, contentService);
@@ skipping 57 matching lines @@
   std::set<std::string> known_suggestion_ids;
   for (ContentSuggestionIdentifier* identifier in knownSuggestions) {
     if (identifier.sectionInfo != sectionInfo)
       continue;
     known_suggestion_ids.insert(identifier.IDInSection);
   }
 
   ContentSuggestionsCategoryWrapper* wrapper =
       [self categoryWrapperForSectionInfo:sectionInfo];
 
-  __weak ContentSuggestionsMediator* weakSelf = self;
-  ntp_snippets::FetchDoneCallback serviceCallback = base::Bind(
-      &BindWrapper,
-      base::BindBlockArc(^void(
-          ntp_snippets::Status status,
-          const std::vector<ntp_snippets::ContentSuggestion>& suggestions) {
-        [weakSelf didFetchMoreSuggestions:suggestions
-                           withStatusCode:status
-                                 callback:callback];
-      }));
+  base::Optional<ntp_snippets::CategoryInfo> categoryInfo =
+      self.contentService->GetCategoryInfo([wrapper category]);
 
-  self.contentService->Fetch([wrapper category], known_suggestion_ids,
-                             serviceCallback);
+  if (categoryInfo) {

[stkhapugin, 2017/04/05 13:06:02]

nit: if (!categoryInfo) { return; } // to avoid identation

[gambard, 2017/04/05 15:30:17]

Done.

+    switch (categoryInfo->additional_action()) {
+      case ntp_snippets::ContentSuggestionsAdditionalAction::NONE:
+        return;
+
+      case ntp_snippets::ContentSuggestionsAdditionalAction::VIEW_ALL:
+        if ([wrapper category].IsKnownCategory(
+                ntp_snippets::KnownCategories::READING_LIST)) {
+          [self.commandHandler openReadingList];
+        }
+        break;
+
+      case ntp_snippets::ContentSuggestionsAdditionalAction::FETCH: {
+        __weak ContentSuggestionsMediator* weakSelf = self;
+        ntp_snippets::FetchDoneCallback serviceCallback =
+            base::Bind(&BindWrapper,
+                       base::BindBlockArc(^void(
+                           ntp_snippets::Status status,
+                           const std::vector<ntp_snippets::ContentSuggestion>&
+                               suggestions) {
+                         [weakSelf didFetchMoreSuggestions:suggestions
+                                            withStatusCode:status
+                                                  callback:callback];
+                       }));
+
+        self.contentService->Fetch([wrapper category], known_suggestion_ids,
+                                   serviceCallback);

[stkhapugin, 2017/04/05 13:06:02]

break;

[gambard, 2017/04/05 15:30:17]

Done.

+      }
+    }
+  }
 }
 
 - (void)fetchFaviconAttributesForURL:(const GURL&)URL
                           completion:(void (^)(FaviconAttributes*))completion {
   [self.attributesProvider fetchFaviconAttributesForURL:URL
                                              completion:completion];
 }
 
 #pragma mark - ContentSuggestionsServiceObserver
 
@@ skipping 136 matching lines @@
         [NSMutableArray array];
     ntp_snippets::Category category = suggestions[0].id().category();
     [self addSuggestions:suggestions
             fromCategory:category
                  toArray:contentSuggestions];
     callback(contentSuggestions);
   }
 }
 
 @end