Index: sync/protocol/proto_value_conversions.cc |
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc |
index f4fe44d10b2fb9897fee9666fa115d32c93c5e6b..e2e0846d959bc90c5424cfd18e93d9f5d6dee9e3 100644 |
--- a/sync/protocol/proto_value_conversions.cc |
+++ b/sync/protocol/proto_value_conversions.cc |
@@ -240,11 +240,36 @@ base::DictionaryValue* TimeRangeDirectiveToValue( |
return value; |
} |
+base::DictionaryValue* SyncedNotificationImageToValue( |
+ const sync_pb::SyncedNotificationImage& proto) { |
+ base::DictionaryValue* value = new base::DictionaryValue(); |
+ SET_STR(url); |
+ return value; |
+} |
+ |
+base::DictionaryValue* SyncedNotificationProfileImageToValue( |
+ const sync_pb::SyncedNotificationProfileImage& proto) { |
+ base::DictionaryValue* value = new base::DictionaryValue(); |
+ SET_STR(image_url); |
+ return value; |
+} |
+ |
+base::DictionaryValue* MediaToValue( |
+ const sync_pb::Media& proto) { |
+ base::DictionaryValue* value = new base::DictionaryValue(); |
+ SET(image, SyncedNotificationImageToValue); |
+ return value; |
+} |
+ |
base::DictionaryValue* SimpleCollapsedLayoutToValue( |
const sync_pb::SimpleCollapsedLayout& proto) { |
base::DictionaryValue* value = new base::DictionaryValue(); |
SET_STR(heading); |
SET_STR(description); |
+ SET_STR(annotation); |
+ SET_REP(media, MediaToValue); |
+ SET_REP(profile_image, SyncedNotificationProfileImageToValue); |
+ SET(app_icon, SyncedNotificationImageToValue); |
return value; |
} |
@@ -258,6 +283,7 @@ base::DictionaryValue* CollapsedInfoToValue( |
base::DictionaryValue* RenderInfoToValue( |
const sync_pb::SyncedNotificationRenderInfo& proto) { |
base::DictionaryValue* value = new base::DictionaryValue(); |
+ // TODO(petewil): Add the expanded info values too. |
SET(collapsed_info, CollapsedInfoToValue); |
return value; |
} |
@@ -267,6 +293,8 @@ base::DictionaryValue* CoalescedNotificationToValue( |
base::DictionaryValue* value = new base::DictionaryValue(); |
SET_STR(key); |
SET_INT32(read_state); |
+ SET_INT64(creation_time_msec); |
+ SET_INT32(priority); |
SET(render_info, RenderInfoToValue); |
return value; |
} |