Hide notifications after their deadline

chrome/browser/android/ntp/content_suggestions_notifier_service.cc

 // 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.
 
 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h"
 
 #include <algorithm>
 
 #include "base/android/application_status_listener.h"
 #include "base/memory/ptr_util.h"
@@ skipping 63 matching lines @@
         weak_ptr_factory_(this) {}
 
   void OnNewSuggestions(Category category) override {
     if (!ShouldNotifyInState(app_status_listener_.GetState())) {
       return;
     }
     const ContentSuggestion* suggestion = GetSuggestionToNotifyAbout(category);
     if (!suggestion) {
       return;
     }
+    base::Time timeout_at = suggestion->notification_extra()
+                                ? suggestion->notification_extra()->deadline
+                                : base::Time::Max();
     service_->FetchSuggestionImage(
         suggestion->id(),
         base::Bind(&NotifyingObserver::ImageFetched,
                    weak_ptr_factory_.GetWeakPtr(), suggestion->id(),
                    suggestion->url(), suggestion->title(),
-                   suggestion->publisher_name()));
+                   suggestion->publisher_name(), timeout_at));
   }
 
   void OnCategoryStatusChanged(Category category,
                                CategoryStatus new_status) override {
     if (!category.IsKnownCategory(KnownCategories::ARTICLES)) {
       return;
     }
     switch (new_status) {
       case CategoryStatus::AVAILABLE:
       case CategoryStatus::AVAILABLE_LOADING:
         break;  // nothing to do
       case CategoryStatus::INITIALIZING:
       case CategoryStatus::ALL_SUGGESTIONS_EXPLICITLY_DISABLED:
       case CategoryStatus::CATEGORY_EXPLICITLY_DISABLED:
       case CategoryStatus::LOADING_ERROR:
       case CategoryStatus::NOT_PROVIDED:
       case CategoryStatus::SIGNED_OUT:
-        ContentSuggestionsNotificationHelper::HideNotification();
+        ContentSuggestionsNotificationHelper::HideAllNotifications();
         break;
     }
   }
 
   void OnSuggestionInvalidated(
       const ContentSuggestion::ID& suggestion_id) override {
     if (suggestion_id.category().IsKnownCategory(KnownCategories::ARTICLES) &&
         (suggestion_id.id_within_category() ==
          prefs_->GetString(kNotificationIDWithinCategory))) {
-      ContentSuggestionsNotificationHelper::HideNotification();
+      ContentSuggestionsNotificationHelper::HideAllNotifications();
     }
   }
 
   void OnFullRefreshRequired() override {
-    ContentSuggestionsNotificationHelper::HideNotification();
+    ContentSuggestionsNotificationHelper::HideAllNotifications();
   }
 
   void ContentSuggestionsServiceShutdown() override {
-    ContentSuggestionsNotificationHelper::HideNotification();
+    ContentSuggestionsNotificationHelper::HideAllNotifications();
   }
 
  private:
   const ContentSuggestion* GetSuggestionToNotifyAbout(Category category) {
     const auto& suggestions = service_->GetSuggestionsForCategory(category);
     // TODO(sfiera): replace with AlwaysNotifyAboutContentSuggestions().
     if (variations::GetVariationParamByFeatureAsBool(
              kContentSuggestionsNotificationsFeature,
              kContentSuggestionsNotificationsAlwaysNotifyParam, false)) {
       if (category.IsKnownCategory(KnownCategories::ARTICLES) &&
           !suggestions.empty()) {
         return &suggestions[0];
       }
       return nullptr;
     }
 
     for (const ContentSuggestion& suggestion : suggestions) {
       if (suggestion.notification_extra()) {
         return &suggestion;
       }
     }
     return nullptr;
   }
 
   void AppStatusChanged(base::android::ApplicationState state) {
     if (!ShouldNotifyInState(state)) {
-      ContentSuggestionsNotificationHelper::HideNotification();
+      ContentSuggestionsNotificationHelper::HideAllNotifications();
     }
   }
 
   void ImageFetched(const ContentSuggestion::ID& id,
                     const GURL& url,
                     const base::string16& title,
                     const base::string16& publisher,
+                    base::Time timeout_at,
                     const gfx::Image& image) {
     if (!ShouldNotifyInState(app_status_listener_.GetState())) {
       return;  // Became foreground while we were fetching the image; forget it.
     }
     // check if suggestion is still valid.
     DVLOG(1) << "Fetched " << image.Size().width() << "x"
              << image.Size().height() << " image for " << url.spec();
     prefs_->SetString(kNotificationIDWithinCategory, id.id_within_category());
     ContentSuggestionsNotificationHelper::SendNotification(
-        url, title, publisher, CropSquare(image));
+        url, title, publisher, CropSquare(image), timeout_at);
   }
 
   ContentSuggestionsService* const service_;
   PrefService* const prefs_;
   base::android::ApplicationStatusListener app_status_listener_;
 
   base::WeakPtrFactory<NotifyingObserver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NotifyingObserver);
 };
 
 ContentSuggestionsNotifierService::ContentSuggestionsNotifierService(
     Profile* profile,
     ContentSuggestionsService* suggestions,
     PrefService* prefs)
     : observer_(base::MakeUnique<NotifyingObserver>(suggestions,
                                                     profile,
                                                     profile->GetPrefs())) {
   suggestions->AddObserver(observer_.get());
 }
 
 ContentSuggestionsNotifierService::~ContentSuggestionsNotifierService() =
     default;
 
 void ContentSuggestionsNotifierService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(kNotificationIDWithinCategory, std::string());
 }