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 "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "third_party/WebKit/public/platform/WebString.h" | 8 #include "third_party/WebKit/public/platform/WebString.h" |
9 #include "third_party/WebKit/public/platform/WebURL.h" | 9 #include "third_party/WebKit/public/platform/WebURL.h" |
10 #include "third_party/WebKit/public/platform/WebVector.h" | 10 #include "third_party/WebKit/public/platform/WebVector.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 break; | 34 break; |
35 } | 35 } |
36 | 36 |
37 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); | 37 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); |
38 platform_data.body = web_data.body; | 38 platform_data.body = web_data.body; |
39 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); | 39 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); |
40 platform_data.icon = GURL(web_data.icon.string()); | 40 platform_data.icon = GURL(web_data.icon.string()); |
41 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), | 41 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), |
42 web_data.vibrate.end()); | 42 web_data.vibrate.end()); |
43 platform_data.silent = web_data.silent; | 43 platform_data.silent = web_data.silent; |
| 44 platform_data.require_interaction = web_data.requireInteraction; |
44 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); | 45 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); |
45 platform_data.actions.resize(web_data.actions.size()); | 46 platform_data.actions.resize(web_data.actions.size()); |
46 for (size_t i = 0; i < web_data.actions.size(); ++i) { | 47 for (size_t i = 0; i < web_data.actions.size(); ++i) { |
47 platform_data.actions[i].action = | 48 platform_data.actions[i].action = |
48 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); | 49 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); |
49 platform_data.actions[i].title = web_data.actions[i].title; | 50 platform_data.actions[i].title = web_data.actions[i].title; |
50 } | 51 } |
51 | 52 |
52 return platform_data; | 53 return platform_data; |
53 } | 54 } |
(...skipping 14 matching lines...) Expand all Loading... |
68 web_data.direction = WebNotificationData::DirectionAuto; | 69 web_data.direction = WebNotificationData::DirectionAuto; |
69 break; | 70 break; |
70 } | 71 } |
71 | 72 |
72 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); | 73 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); |
73 web_data.body = platform_data.body; | 74 web_data.body = platform_data.body; |
74 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); | 75 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); |
75 web_data.icon = blink::WebURL(platform_data.icon); | 76 web_data.icon = blink::WebURL(platform_data.icon); |
76 web_data.vibrate = platform_data.vibration_pattern; | 77 web_data.vibrate = platform_data.vibration_pattern; |
77 web_data.silent = platform_data.silent; | 78 web_data.silent = platform_data.silent; |
| 79 web_data.requireInteraction = platform_data.require_interaction; |
78 web_data.data = platform_data.data; | 80 web_data.data = platform_data.data; |
79 blink::WebVector<blink::WebNotificationAction> resized( | 81 blink::WebVector<blink::WebNotificationAction> resized( |
80 platform_data.actions.size()); | 82 platform_data.actions.size()); |
81 web_data.actions.swap(resized); | 83 web_data.actions.swap(resized); |
82 for (size_t i = 0; i < platform_data.actions.size(); ++i) { | 84 for (size_t i = 0; i < platform_data.actions.size(); ++i) { |
83 web_data.actions[i].action = | 85 web_data.actions[i].action = |
84 blink::WebString::fromUTF8(platform_data.actions[i].action); | 86 blink::WebString::fromUTF8(platform_data.actions[i].action); |
85 web_data.actions[i].title = platform_data.actions[i].title; | 87 web_data.actions[i].title = platform_data.actions[i].title; |
86 } | 88 } |
87 | 89 |
88 return web_data; | 90 return web_data; |
89 } | 91 } |
90 | 92 |
91 } // namespace content | 93 } // namespace content |
OLD | NEW |