Plumb Blink notification actions to button UI on desktop

content/child/notifications/notification_data_conversions.cc

 // Copyright 2014 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 "content/child/notifications/notification_data_conversions.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
+#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationAction.h"
 
 using blink::WebNotificationData;
 
 namespace content {
 
 PlatformNotificationData ToPlatformNotificationData(
     const WebNotificationData& web_data) {
   PlatformNotificationData platform_data;
   platform_data.title = web_data.title;
   platform_data.direction =
       web_data.direction == WebNotificationData::DirectionLeftToRight
           ? PlatformNotificationData::NotificationDirectionLeftToRight
           : PlatformNotificationData::NotificationDirectionRightToLeft;
   platform_data.lang = base::UTF16ToUTF8(web_data.lang);
   platform_data.body = web_data.body;
   platform_data.tag = base::UTF16ToUTF8(web_data.tag);
   platform_data.icon = GURL(web_data.icon.string());
   platform_data.vibration_pattern.assign(web_data.vibrate.begin(),
                                          web_data.vibrate.end());
   platform_data.silent = web_data.silent;
   platform_data.data.assign(web_data.data.begin(), web_data.data.end());
+  platform_data.actions.clear();

[Peter Beverloo, 2015/07/30 17:02:05]

This is not necessary - it's a new object.

[johnme, 2015/07/31 18:21:31]

Done.

+  platform_data.actions.resize(web_data.actions.size());
+  for (size_t i = 0; i < web_data.actions.size(); ++i) {
+    platform_data.actions[i].action = web_data.actions[i].action;
+    platform_data.actions[i].title = web_data.actions[i].title;
+  }
 
   return platform_data;
 }
 
 WebNotificationData ToWebNotificationData(
     const PlatformNotificationData& platform_data) {
   WebNotificationData web_data;
   web_data.title = platform_data.title;
   web_data.direction =
       platform_data.direction ==
           PlatformNotificationData::NotificationDirectionLeftToRight
           ? WebNotificationData::DirectionLeftToRight
           : WebNotificationData::DirectionRightToLeft;
   web_data.lang = blink::WebString::fromUTF8(platform_data.lang);
   web_data.body = platform_data.body;
   web_data.tag = blink::WebString::fromUTF8(platform_data.tag);
   web_data.icon = blink::WebURL(platform_data.icon);
   web_data.vibrate = platform_data.vibration_pattern;
   web_data.silent = platform_data.silent;
   web_data.data = platform_data.data;
+  blink::WebVector<blink::WebNotificationAction> cleared_and_resized(
+      platform_data.actions.size());
+  web_data.actions.swap(cleared_and_resized);

[Peter Beverloo, 2015/07/30 17:02:05]

Just use web_data.actions.resize()?

[Peter Beverloo, 2015/07/30 17:02:05]

This is not necessary - it's a new object.

[johnme, 2015/07/31 18:21:31]

WebVector has no resize.

[johnme, 2015/07/31 18:21:31]

Renamed this, to avoid the implication that it's clearing anything.

+  for (size_t i = 0; i < platform_data.actions.size(); ++i) {
+      web_data.actions[i].action = platform_data.actions[i].action;
+      web_data.actions[i].title = platform_data.actions[i].title;
+  }
 
   return web_data;
 }
 
 }  // namespace content