feat: support for put_SuppressPopup to establish renotify property (WIN)

support renotify property for Platform service
electron · YuriL180821 · Sep 25, 2022 · Dec 23, 2021 · Dec 9, 2021 · Jan 10, 2022
commit 0afafcd19f97a7b9f4b8800285c159a97e191935
diff --git a/shell/browser/notifications/notification.h b/shell/browser/notifications/notification.h
@@ -60,6 +60,8 @@ struct NotificationOptions {
   bool require_interaction;  // SAP-17772: configuration toast show time
                              // according to
                              // Notification.requireInteraction property
+  bool should_be_presented;  // 16-SAP-18595: display toast according to
+                             // Notification.renotify
 
   NotificationOptions();
   ~NotificationOptions();

diff --git a/shell/browser/notifications/platform_notification_service.cc b/shell/browser/notifications/platform_notification_service.cc
@@ -30,6 +30,7 @@ void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
                               const SkBitmap& icon,
                               const blink::PlatformNotificationData& data,
                               bool is_persistent,
+                              bool is_replacing,
                               bool audio_muted,
                               bool allowed) {
   if (!notification)
@@ -47,6 +48,8 @@ void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
     // feat: configuration toast show time according to
     // Notification.requireInteraction property
     options.require_interaction = data.require_interaction;
+    // feat: display toast according to Notification.renotify
+    options.should_be_presented = data.renotify ? true : !is_replacing;
     // feat: support Notification.data property
     // header calculation bellow is caused by presence some not described hader
     // into data received see ReadData in
@@ -185,7 +188,9 @@ void PlatformNotificationService::DisplayNotification(
   // the same tag is already extant.
   //
   // See: https://notifications.spec.whatwg.org/#showing-a-notification
+  const size_t prev_notif_count = presenter->notifications().size();
   presenter->CloseNotificationWithId(notification_id);
+  const size_t curr_notif_count = presenter->notifications().size();
 
   auto* delegate = new NotificationDelegateImpl(notification_id, origin);
 
@@ -194,11 +199,12 @@ void PlatformNotificationService::DisplayNotification(
     // feat: correct processing for the persistent notification without
     // actions
     const bool is_persistent(false);
+    const bool is_replacing(prev_notif_count > curr_notif_count);
     browser_client_->WebNotificationAllowed(
         content::WebContents::FromRenderFrameHost(render_frame_host),
         base::BindRepeating(&OnWebNotificationAllowed, notification,
                             notification_resources.notification_icon,
-                            notification_data, is_persistent));
+                            notification_data, is_persistent, is_replacing));
   }
 }
 
@@ -216,7 +222,9 @@ void PlatformNotificationService::DisplayPersistentNotification(
   if (!presenter)
     return;
 
+  const size_t prev_notif_count = presenter->notifications().size();
   presenter->CloseNotificationWithId(notification_id);
+  const size_t curr_notif_count = presenter->notifications().size();
 
   auto* delegate = new NotificationDelegateImpl(notification_id, origin);
 
@@ -229,10 +237,12 @@ void PlatformNotificationService::DisplayPersistentNotification(
     // feat: correct processing for the persistent notification without
     // actions
     const bool is_persistent(true);
+    const bool is_replacing(prev_notif_count > curr_notif_count);
     browser_client_->WebNotificationAllowed(
-        web_ctx, base::BindRepeating(&OnWebNotificationAllowed, notification,
-                                     notification_resources.notification_icon,
-                                     notification_data, is_persistent));
+        web_ctx,
+        base::BindRepeating(&OnWebNotificationAllowed, notification,
+                            notification_resources.notification_icon,
+                            notification_data, is_persistent, is_replacing));
     // OnWebNotificationAllowed( notification,
     //     notification_resources.notification_icon,
     //     notification_data, is_persistent, false, true);

diff --git a/shell/browser/notifications/win/windows_toast_notification.cc b/shell/browser/notifications/win/windows_toast_notification.cc
@@ -348,6 +348,11 @@ HRESULT WindowsToastNotification::ShowInternal(
       toast_notification2_->put_Tag(HStringReference(hex_str.c_str()).Get()),
       "WinAPI: put_Tag failed");
 
+  // 16-SAP-18595: display toast according to Notification.renotify
+  REPORT_AND_RETURN_IF_FAILED(
+      toast_notification2_->put_SuppressPopup(!options.should_be_presented),
+      "WinAPI: setup put_Suppress failed");
+
   REPORT_AND_RETURN_IF_FAILED(SetupCallbacks(toast_notification_.Get()),
                               "WinAPI: SetupCallbacks failed");