OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/child/notifications/notification_data_conversions.h" | 5 #include "content/child/notifications/notification_data_conversions.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; | 33 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; |
34 break; | 34 break; |
35 case WebNotificationData::DirectionAuto: | 35 case WebNotificationData::DirectionAuto: |
36 platform_data.direction = PlatformNotificationData::DIRECTION_AUTO; | 36 platform_data.direction = PlatformNotificationData::DIRECTION_AUTO; |
37 break; | 37 break; |
38 } | 38 } |
39 | 39 |
40 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); | 40 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); |
41 platform_data.body = web_data.body; | 41 platform_data.body = web_data.body; |
42 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); | 42 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); |
| 43 platform_data.image = blink::WebStringToGURL(web_data.image.string()); |
43 platform_data.icon = blink::WebStringToGURL(web_data.icon.string()); | 44 platform_data.icon = blink::WebStringToGURL(web_data.icon.string()); |
44 platform_data.badge = blink::WebStringToGURL(web_data.badge.string()); | 45 platform_data.badge = blink::WebStringToGURL(web_data.badge.string()); |
45 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), | 46 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), |
46 web_data.vibrate.end()); | 47 web_data.vibrate.end()); |
47 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp); | 48 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp); |
48 platform_data.renotify = web_data.renotify; | 49 platform_data.renotify = web_data.renotify; |
49 platform_data.silent = web_data.silent; | 50 platform_data.silent = web_data.silent; |
50 platform_data.require_interaction = web_data.requireInteraction; | 51 platform_data.require_interaction = web_data.requireInteraction; |
51 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); | 52 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); |
52 platform_data.actions.resize(web_data.actions.size()); | 53 platform_data.actions.resize(web_data.actions.size()); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 web_data.direction = WebNotificationData::DirectionRightToLeft; | 88 web_data.direction = WebNotificationData::DirectionRightToLeft; |
88 break; | 89 break; |
89 case PlatformNotificationData::DIRECTION_AUTO: | 90 case PlatformNotificationData::DIRECTION_AUTO: |
90 web_data.direction = WebNotificationData::DirectionAuto; | 91 web_data.direction = WebNotificationData::DirectionAuto; |
91 break; | 92 break; |
92 } | 93 } |
93 | 94 |
94 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); | 95 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); |
95 web_data.body = platform_data.body; | 96 web_data.body = platform_data.body; |
96 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); | 97 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); |
| 98 web_data.image = blink::WebURL(platform_data.image); |
97 web_data.icon = blink::WebURL(platform_data.icon); | 99 web_data.icon = blink::WebURL(platform_data.icon); |
98 web_data.badge = blink::WebURL(platform_data.badge); | 100 web_data.badge = blink::WebURL(platform_data.badge); |
99 web_data.vibrate = platform_data.vibration_pattern; | 101 web_data.vibrate = platform_data.vibration_pattern; |
100 web_data.timestamp = platform_data.timestamp.ToJsTime(); | 102 web_data.timestamp = platform_data.timestamp.ToJsTime(); |
101 web_data.renotify = platform_data.renotify; | 103 web_data.renotify = platform_data.renotify; |
102 web_data.silent = platform_data.silent; | 104 web_data.silent = platform_data.silent; |
103 web_data.requireInteraction = platform_data.require_interaction; | 105 web_data.requireInteraction = platform_data.require_interaction; |
104 web_data.data = platform_data.data; | 106 web_data.data = platform_data.data; |
105 blink::WebVector<blink::WebNotificationAction> resized( | 107 blink::WebVector<blink::WebNotificationAction> resized( |
106 platform_data.actions.size()); | 108 platform_data.actions.size()); |
(...skipping 14 matching lines...) Expand all Loading... |
121 blink::WebString::fromUTF8(platform_data.actions[i].action); | 123 blink::WebString::fromUTF8(platform_data.actions[i].action); |
122 web_data.actions[i].title = platform_data.actions[i].title; | 124 web_data.actions[i].title = platform_data.actions[i].title; |
123 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); | 125 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); |
124 web_data.actions[i].placeholder = platform_data.actions[i].placeholder; | 126 web_data.actions[i].placeholder = platform_data.actions[i].placeholder; |
125 } | 127 } |
126 | 128 |
127 return web_data; | 129 return web_data; |
128 } | 130 } |
129 | 131 |
130 } // namespace content | 132 } // namespace content |
OLD | NEW |