Implement receiving side of web notification inline replies

content/browser/notifications/notification_database_data_conversions.cc

 // Copyright 2015 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/browser/notifications/notification_database_data_conversions.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 55 matching lines @@
   notification_data->silent = payload.silent();
   notification_data->require_interaction = payload.require_interaction();
 
   if (payload.data().length()) {
     notification_data->data.assign(payload.data().begin(),
                                    payload.data().end());
   }
 
   for (const auto& payload_action : payload.actions()) {
     PlatformNotificationAction action;
+
+    switch (payload_action.type()) {
+      case NotificationDatabaseDataProto::NotificationAction::BUTTON:
+        action.type = PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON;
+        break;
+      case NotificationDatabaseDataProto::NotificationAction::TEXT:
+        action.type = PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT;
+        break;
+      default:
+        NOTREACHED();
+    }
+
     action.action = payload_action.action();
     action.title = base::UTF8ToUTF16(payload_action.title());
     action.icon = GURL(payload_action.icon());
+    if (payload_action.has_placeholder()) {
+      action.placeholder = base::NullableString16(
+          base::UTF8ToUTF16(payload_action.placeholder()), false);
+    } else {
+      action.placeholder = base::NullableString16();

[Peter Beverloo, 2016/04/06 17:22:00]

nit: this should be done implicitly by the constructor on line 75?

[Nina, 2016/04/07 10:59:09]

Indeed! Removed.

+    }
     notification_data->actions.push_back(action);
   }
 
   return true;
 }
 
 bool SerializeNotificationDatabaseData(const NotificationDatabaseData& input,
                                        std::string* output) {
   DCHECK(output);
 
@@ skipping 34 matching lines @@
   payload->set_require_interaction(notification_data.require_interaction);
 
   if (notification_data.data.size()) {
     payload->set_data(&notification_data.data.front(),
                       notification_data.data.size());
   }
 
   for (const PlatformNotificationAction& action : notification_data.actions) {
     NotificationDatabaseDataProto::NotificationAction* payload_action =
         payload->add_actions();
+
+    switch (action.type) {
+      case PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON:
+        payload_action->set_type(
+            NotificationDatabaseDataProto::NotificationAction::BUTTON);
+        break;
+      case PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT:
+        payload_action->set_type(
+            NotificationDatabaseDataProto::NotificationAction::TEXT);
+        break;
+      default:
+        NOTREACHED() << "Unknown action type: " << action.type;
+    }
+
     payload_action->set_action(action.action);
     payload_action->set_title(base::UTF16ToUTF8(action.title));
     payload_action->set_icon(action.icon.spec());
+
+    if (!action.placeholder.is_null()) {
+      payload_action->set_placeholder(
+          base::UTF16ToUTF8(action.placeholder.string()));
+    }
   }
 
   NotificationDatabaseDataProto message;
   message.set_notification_id(input.notification_id);
   message.set_origin(input.origin.spec());
   message.set_service_worker_registration_id(
       input.service_worker_registration_id);
   message.set_allocated_notification_data(payload.release());
 
   return message.SerializeToString(output);
 }
 
 }  // namespace content