content/child/notifications/notification_data_conversions.cc - Issue 1267673003: Plumb Blink notification actions to button UI on desktop

Unified Diff: content/child/notifications/notification_data_conversions.cc

Issue 1267673003: Plumb Blink notification actions to button UI on desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/notifications/platform_notification_service_unittest.cc ('K') | « chrome/browser/notifications/platform_notification_service_unittest.cc ('k') | content/child/notifications/notification_data_conversions_unittest.cc » ('j') | content/child/notifications/notification_data_conversions_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/notifications/notification_data_conversions.cc

diff --git a/content/child/notifications/notification_data_conversions.cc b/content/child/notifications/notification_data_conversions.cc

index f5fe5bb12ef66dc5d88bc5fef957d9096fe03bf1..1f18b1019643dd4645031e1b48e06cb589a8ee68 100644

--- a/content/child/notifications/notification_data_conversions.cc

+++ b/content/child/notifications/notification_data_conversions.cc

@@ -7,6 +7,8 @@

#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;

@@ -28,6 +30,12 @@ PlatformNotificationData ToPlatformNotificationData(

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;

}

@@ -48,6 +56,13 @@ WebNotificationData ToWebNotificationData(

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 c

+ 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;

}