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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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.require_interaction = web_data.requireInteraction; | 48 platform_data.require_interaction = web_data.requireInteraction; |
49 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); | 49 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); |
50 platform_data.actions.resize(web_data.actions.size()); | 50 platform_data.actions.resize(web_data.actions.size()); |
51 for (size_t i = 0; i < web_data.actions.size(); ++i) { | 51 for (size_t i = 0; i < web_data.actions.size(); ++i) { |
52 platform_data.actions[i].action = | 52 platform_data.actions[i].action = |
53 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); | 53 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); |
54 platform_data.actions[i].title = web_data.actions[i].title; | 54 platform_data.actions[i].title = web_data.actions[i].title; |
| 55 platform_data.actions[i].icon = |
| 56 blink::WebStringToGURL(web_data.actions[i].icon.string()); |
55 } | 57 } |
56 | 58 |
57 return platform_data; | 59 return platform_data; |
58 } | 60 } |
59 | 61 |
60 WebNotificationData ToWebNotificationData( | 62 WebNotificationData ToWebNotificationData( |
61 const PlatformNotificationData& platform_data) { | 63 const PlatformNotificationData& platform_data) { |
62 WebNotificationData web_data; | 64 WebNotificationData web_data; |
63 web_data.title = platform_data.title; | 65 web_data.title = platform_data.title; |
64 | 66 |
(...skipping 18 matching lines...) Expand all Loading... |
83 web_data.silent = platform_data.silent; | 85 web_data.silent = platform_data.silent; |
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; |
| 95 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); |
93 } | 96 } |
94 | 97 |
95 return web_data; | 98 return web_data; |
96 } | 99 } |
97 | 100 |
98 } // namespace content | 101 } // namespace content |
OLD | NEW |