Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1250)

Unified Diff: content/browser/notifications/notification_database_data_conversions.cc

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
Index: content/browser/notifications/notification_database_data_conversions.cc
diff --git a/content/browser/notifications/notification_database_data_conversions.cc b/content/browser/notifications/notification_database_data_conversions.cc
index d183dd414e2cf2a67b37c52a639a7f83ed2100c7..d656f7dec6b5c9f6cacb22d13206a0acd09faa07 100644
--- a/content/browser/notifications/notification_database_data_conversions.cc
+++ b/content/browser/notifications/notification_database_data_conversions.cc
@@ -40,6 +40,11 @@ bool DeserializeNotificationDatabaseData(const std::string& input,
notification_data->icon = GURL(payload.icon());
notification_data->silent = payload.silent();
+ if (payload.data().length()) {
+ notification_data->data.assign(payload.data().begin(),
+ payload.data().end());
+ }
+
return true;
}
@@ -64,6 +69,11 @@ bool SerializeNotificationDatabaseData(const NotificationDatabaseData& input,
payload->set_icon(notification_data.icon.spec());
payload->set_silent(notification_data.silent);
+ if (notification_data.data.size()) {
+ payload->set_data(&notification_data.data.front(),
+ notification_data.data.size());
+ }
+
NotificationDatabaseDataProto message;
message.set_notification_id(input.notification_id);
message.set_origin(input.origin.spec());

Powered by Google App Engine
This is Rietveld 408576698