Linux native notifications: Support list notifications

chrome/browser/notifications/notification_platform_bridge_linux.cc

 // 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.
 
 #include "chrome/browser/notifications/notification_platform_bridge_linux.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ skipping 422 matching lines @@
     writer.AppendString("");
 
     std::string summary = base::UTF16ToUTF8(notification->title());
     if (notification->type() == message_center::NOTIFICATION_TYPE_PROGRESS)
       summary = base::IntToString(notification->progress()) + "% - " + summary;
     writer.AppendString(summary);
 
     std::string body;
     if (base::ContainsKey(capabilities_, "body")) {
       body = base::UTF16ToUTF8(notification->message());
-      if (base::ContainsKey(capabilities_, "body-markup")) {
+      const bool body_markup = base::ContainsKey(capabilities_, "body-markup");
+      if (body_markup) {
         base::ReplaceSubstringsAfterOffset(&body, 0, "&", "&amp;");
         base::ReplaceSubstringsAfterOffset(&body, 0, "<", "&lt;");
         base::ReplaceSubstringsAfterOffset(&body, 0, ">", "&gt;");
       }
+      if (notification->type() == message_center::NOTIFICATION_TYPE_MULTIPLE) {
+        for (const auto& item : notification->items()) {
+          if (!body.empty())
+            body += "\n";
+          const std::string title = base::UTF16ToUTF8(item.title);
+          const std::string message = base::UTF16ToUTF8(item.message);
+          if (body_markup)
+            body += "<b>" + title + "</b> " + message;

[Peter Beverloo, 2017/05/09 22:52:04]

Could you add a TODO (in my name if you prefer) to figure out the right way to
internationalize this? We're doing this on all platforms, including the Message
Center, so there wouldn't be a regression, but I *think* this needs to be
flipped around for RTL languages.

[Tom (Use chromium acct), 2017/05/10 20:41:31]

Done.

+          else
+            body += title + " - " + message;

[Peter Beverloo, 2017/05/09 22:52:04]

Does the newline (:452) work even for notification centers that don't support
body markup?

[Tom (Use chromium acct), 2017/05/10 20:41:31]

Yes

+        }
+      }
     }
     writer.AppendString(body);
 
     // Even-indexed elements in this vector are action IDs passed back to
     // us in OnActionInvoked().  Odd-indexed ones contain the button text.
     std::vector<std::string> actions;
     if (base::ContainsKey(capabilities_, "actions")) {
       data->action_start = data->action_end;
       for (const auto& button_info : notification->buttons()) {
         // FDO notification buttons can contain either an icon or a label,
@@ skipping 333 matching lines @@
 }
 
 void NotificationPlatformBridgeLinux::SetReadyCallback(
     NotificationBridgeReadyCallback callback) {
   impl_->SetReadyCallback(std::move(callback));
 }
 
 void NotificationPlatformBridgeLinux::CleanUp() {
   impl_->CleanUp();
 }