Implement receiving side of web notification inline replies

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 <stddef.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "third_party/WebKit/public/platform/URLConversion.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 {
 
+namespace {
+static const char kButtonString[] = "button";

[Michael van Ouwerkerk, 2016/04/05 10:06:54]

nit: rename to kTypeButton and kTypeText

[Nina, 2016/04/05 13:28:22]

Done.

+static const char kTextString[] = "text";
+}
+
 PlatformNotificationData ToPlatformNotificationData(
     const WebNotificationData& web_data) {
   PlatformNotificationData platform_data;
   platform_data.title = web_data.title;
 
   switch (web_data.direction) {
     case WebNotificationData::DirectionLeftToRight:
       platform_data.direction =
           PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
       break;
@@ skipping 13 matching lines @@
   platform_data.badge = blink::WebStringToGURL(web_data.badge.string());
   platform_data.vibration_pattern.assign(web_data.vibrate.begin(),
                                          web_data.vibrate.end());
   platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp);
   platform_data.renotify = web_data.renotify;
   platform_data.silent = web_data.silent;
   platform_data.require_interaction = web_data.requireInteraction;
   platform_data.data.assign(web_data.data.begin(), web_data.data.end());
   platform_data.actions.resize(web_data.actions.size());
   for (size_t i = 0; i < web_data.actions.size(); ++i) {
+    if (web_data.actions[i].type == kButtonString) {
+      platform_data.actions[i].type = PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON;
+    } else if (web_data.actions[i].type == kTextString) {
+      platform_data.actions[i].type = PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT;
+    } else {
+      NOTREACHED() << "Unknown notification action type: "
+                   << web_data.actions[i].type.utf8();
+    }
+    platform_data.actions[i].placeholder = web_data.actions[i].placeholder;
     platform_data.actions[i].action =
         base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action));

[Michael van Ouwerkerk, 2016/04/05 10:06:54]

Hmm, it seems no conversions are needed for placeholder and title, can we remove
it here also?

[Nina, 2016/04/05 13:28:22]

Unfortunately, action is std::string (as opposed to base::string16).

     platform_data.actions[i].title = web_data.actions[i].title;
     platform_data.actions[i].icon =
         blink::WebStringToGURL(web_data.actions[i].icon.string());
   }
 
   return platform_data;
 }
 
 WebNotificationData ToWebNotificationData(
     const PlatformNotificationData& platform_data) {
@@ skipping 20 matching lines @@
   web_data.vibrate = platform_data.vibration_pattern;
   web_data.timestamp = platform_data.timestamp.ToJsTime();
   web_data.renotify = platform_data.renotify;
   web_data.silent = platform_data.silent;
   web_data.requireInteraction = platform_data.require_interaction;
   web_data.data = platform_data.data;
   blink::WebVector<blink::WebNotificationAction> resized(
       platform_data.actions.size());
   web_data.actions.swap(resized);
   for (size_t i = 0; i < platform_data.actions.size(); ++i) {
+    switch (platform_data.actions[i].type) {
+      case PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON:
+        web_data.actions[i].type = kButtonString;
+        break;
+      case PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT:
+        web_data.actions[i].type = kTextString;
+        break;
+      default:
+        NOTREACHED() << "Unknown platform data type: "
+                     << platform_data.actions[i].type;
+    }
+    web_data.actions[i].placeholder = platform_data.actions[i].placeholder;
     web_data.actions[i].action =
         blink::WebString::fromUTF8(platform_data.actions[i].action);

[Michael van Ouwerkerk, 2016/04/05 10:06:54]

Same thing here, can the conversion code be removed?

[Nina, 2016/04/05 13:28:22]

^^

     web_data.actions[i].title = platform_data.actions[i].title;
     web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon);
   }
 
   return web_data;
 }
 
 }  // namespace content