| 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 27 matching lines...) Expand all Loading... |
| 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.silent = web_data.silent; | 47 platform_data.silent = web_data.silent; |
| 48 platform_data.renotify = web_data.renotify; |
| 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 } | 56 } |
| 56 | 57 |
| 57 return platform_data; | 58 return platform_data; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 74 break; | 75 break; |
| 75 } | 76 } |
| 76 | 77 |
| 77 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); | 78 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); |
| 78 web_data.body = platform_data.body; | 79 web_data.body = platform_data.body; |
| 79 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); | 80 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); |
| 80 web_data.icon = blink::WebURL(platform_data.icon); | 81 web_data.icon = blink::WebURL(platform_data.icon); |
| 81 web_data.vibrate = platform_data.vibration_pattern; | 82 web_data.vibrate = platform_data.vibration_pattern; |
| 82 web_data.timestamp = platform_data.timestamp.ToJsTime(); | 83 web_data.timestamp = platform_data.timestamp.ToJsTime(); |
| 83 web_data.silent = platform_data.silent; | 84 web_data.silent = platform_data.silent; |
| 85 web_data.renotify = platform_data.renotify; |
| 84 web_data.requireInteraction = platform_data.require_interaction; | 86 web_data.requireInteraction = platform_data.require_interaction; |
| 85 web_data.data = platform_data.data; | 87 web_data.data = platform_data.data; |
| 86 blink::WebVector<blink::WebNotificationAction> resized( | 88 blink::WebVector<blink::WebNotificationAction> resized( |
| 87 platform_data.actions.size()); | 89 platform_data.actions.size()); |
| 88 web_data.actions.swap(resized); | 90 web_data.actions.swap(resized); |
| 89 for (size_t i = 0; i < platform_data.actions.size(); ++i) { | 91 for (size_t i = 0; i < platform_data.actions.size(); ++i) { |
| 90 web_data.actions[i].action = | 92 web_data.actions[i].action = |
| 91 blink::WebString::fromUTF8(platform_data.actions[i].action); | 93 blink::WebString::fromUTF8(platform_data.actions[i].action); |
| 92 web_data.actions[i].title = platform_data.actions[i].title; | 94 web_data.actions[i].title = platform_data.actions[i].title; |
| 93 } | 95 } |
| 94 | 96 |
| 95 return web_data; | 97 return web_data; |
| 96 } | 98 } |
| 97 | 99 |
| 98 } // namespace content | 100 } // namespace content |
| OLD | NEW |