| 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 "content/public/child/url_conversion.h" |
| 10 #include "third_party/WebKit/public/platform/WebString.h" | 11 #include "third_party/WebKit/public/platform/WebString.h" |
| 11 #include "third_party/WebKit/public/platform/WebURL.h" | 12 #include "third_party/WebKit/public/platform/WebURL.h" |
| 12 #include "third_party/WebKit/public/platform/WebVector.h" | 13 #include "third_party/WebKit/public/platform/WebVector.h" |
| 13 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati
onAction.h" | 14 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati
onAction.h" |
| 14 | 15 |
| 15 using blink::WebNotificationData; | 16 using blink::WebNotificationData; |
| 16 | 17 |
| 17 namespace content { | 18 namespace content { |
| 18 | 19 |
| 19 PlatformNotificationData ToPlatformNotificationData( | 20 PlatformNotificationData ToPlatformNotificationData( |
| (...skipping 11 matching lines...) Expand all Loading... |
| 31 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; | 32 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; |
| 32 break; | 33 break; |
| 33 case WebNotificationData::DirectionAuto: | 34 case WebNotificationData::DirectionAuto: |
| 34 platform_data.direction = PlatformNotificationData::DIRECTION_AUTO; | 35 platform_data.direction = PlatformNotificationData::DIRECTION_AUTO; |
| 35 break; | 36 break; |
| 36 } | 37 } |
| 37 | 38 |
| 38 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); | 39 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); |
| 39 platform_data.body = web_data.body; | 40 platform_data.body = web_data.body; |
| 40 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); | 41 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); |
| 41 platform_data.icon = GURL(web_data.icon.string()); | 42 platform_data.icon = WebStringToGURL(web_data.icon.string()); |
| 42 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), | 43 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), |
| 43 web_data.vibrate.end()); | 44 web_data.vibrate.end()); |
| 44 platform_data.silent = web_data.silent; | 45 platform_data.silent = web_data.silent; |
| 45 platform_data.require_interaction = web_data.requireInteraction; | 46 platform_data.require_interaction = web_data.requireInteraction; |
| 46 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); | 47 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); |
| 47 platform_data.actions.resize(web_data.actions.size()); | 48 platform_data.actions.resize(web_data.actions.size()); |
| 48 for (size_t i = 0; i < web_data.actions.size(); ++i) { | 49 for (size_t i = 0; i < web_data.actions.size(); ++i) { |
| 49 platform_data.actions[i].action = | 50 platform_data.actions[i].action = |
| 50 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); | 51 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); |
| 51 platform_data.actions[i].title = web_data.actions[i].title; | 52 platform_data.actions[i].title = web_data.actions[i].title; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 for (size_t i = 0; i < platform_data.actions.size(); ++i) { | 86 for (size_t i = 0; i < platform_data.actions.size(); ++i) { |
| 86 web_data.actions[i].action = | 87 web_data.actions[i].action = |
| 87 blink::WebString::fromUTF8(platform_data.actions[i].action); | 88 blink::WebString::fromUTF8(platform_data.actions[i].action); |
| 88 web_data.actions[i].title = platform_data.actions[i].title; | 89 web_data.actions[i].title = platform_data.actions[i].title; |
| 89 } | 90 } |
| 90 | 91 |
| 91 return web_data; | 92 return web_data; |
| 92 } | 93 } |
| 93 | 94 |
| 94 } // namespace content | 95 } // namespace content |
| OLD | NEW |