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 26 matching lines...) Expand all Loading... |
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.icon = blink::WebStringToGURL(web_data.icon.string()); | 43 platform_data.icon = blink::WebStringToGURL(web_data.icon.string()); |
44 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), | 44 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), |
45 web_data.vibrate.end()); | 45 web_data.vibrate.end()); |
46 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp); | 46 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp); |
| 47 platform_data.renotify = web_data.renotify; |
47 platform_data.silent = web_data.silent; | 48 platform_data.silent = web_data.silent; |
48 platform_data.require_interaction = web_data.requireInteraction; | 49 platform_data.require_interaction = web_data.requireInteraction; |
49 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); | 50 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); |
50 platform_data.actions.resize(web_data.actions.size()); | 51 platform_data.actions.resize(web_data.actions.size()); |
51 for (size_t i = 0; i < web_data.actions.size(); ++i) { | 52 for (size_t i = 0; i < web_data.actions.size(); ++i) { |
52 platform_data.actions[i].action = | 53 platform_data.actions[i].action = |
53 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); | 54 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); |
54 platform_data.actions[i].title = web_data.actions[i].title; | 55 platform_data.actions[i].title = web_data.actions[i].title; |
55 platform_data.actions[i].icon = | 56 platform_data.actions[i].icon = |
56 blink::WebStringToGURL(web_data.actions[i].icon.string()); | 57 blink::WebStringToGURL(web_data.actions[i].icon.string()); |
(...skipping 18 matching lines...) Expand all Loading... |
75 web_data.direction = WebNotificationData::DirectionAuto; | 76 web_data.direction = WebNotificationData::DirectionAuto; |
76 break; | 77 break; |
77 } | 78 } |
78 | 79 |
79 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); | 80 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); |
80 web_data.body = platform_data.body; | 81 web_data.body = platform_data.body; |
81 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); | 82 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); |
82 web_data.icon = blink::WebURL(platform_data.icon); | 83 web_data.icon = blink::WebURL(platform_data.icon); |
83 web_data.vibrate = platform_data.vibration_pattern; | 84 web_data.vibrate = platform_data.vibration_pattern; |
84 web_data.timestamp = platform_data.timestamp.ToJsTime(); | 85 web_data.timestamp = platform_data.timestamp.ToJsTime(); |
| 86 web_data.renotify = platform_data.renotify; |
85 web_data.silent = platform_data.silent; | 87 web_data.silent = platform_data.silent; |
86 web_data.requireInteraction = platform_data.require_interaction; | 88 web_data.requireInteraction = platform_data.require_interaction; |
87 web_data.data = platform_data.data; | 89 web_data.data = platform_data.data; |
88 blink::WebVector<blink::WebNotificationAction> resized( | 90 blink::WebVector<blink::WebNotificationAction> resized( |
89 platform_data.actions.size()); | 91 platform_data.actions.size()); |
90 web_data.actions.swap(resized); | 92 web_data.actions.swap(resized); |
91 for (size_t i = 0; i < platform_data.actions.size(); ++i) { | 93 for (size_t i = 0; i < platform_data.actions.size(); ++i) { |
92 web_data.actions[i].action = | 94 web_data.actions[i].action = |
93 blink::WebString::fromUTF8(platform_data.actions[i].action); | 95 blink::WebString::fromUTF8(platform_data.actions[i].action); |
94 web_data.actions[i].title = platform_data.actions[i].title; | 96 web_data.actions[i].title = platform_data.actions[i].title; |
95 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); | 97 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); |
96 } | 98 } |
97 | 99 |
98 return web_data; | 100 return web_data; |
99 } | 101 } |
100 | 102 |
101 } // namespace content | 103 } // namespace content |
OLD | NEW |