OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/browser/notifications/notification_database_data_conversions.h " | 5 #include "content/browser/notifications/notification_database_data_conversions.h " |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "content/browser/notifications/notification_database_data.pb.h" | 9 #include "content/browser/notifications/notification_database_data.pb.h" |
10 #include "content/public/browser/notification_database_data.h" | 10 #include "content/public/browser/notification_database_data.h" |
(...skipping 20 matching lines...) Expand all Loading... | |
31 notification_data->title = base::UTF8ToUTF16(payload.title()); | 31 notification_data->title = base::UTF8ToUTF16(payload.title()); |
32 notification_data->direction = | 32 notification_data->direction = |
33 payload.direction() == | 33 payload.direction() == |
34 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT ? | 34 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT ? |
35 PlatformNotificationData::NotificationDirectionRightToLeft : | 35 PlatformNotificationData::NotificationDirectionRightToLeft : |
36 PlatformNotificationData::NotificationDirectionLeftToRight; | 36 PlatformNotificationData::NotificationDirectionLeftToRight; |
37 notification_data->lang = payload.lang(); | 37 notification_data->lang = payload.lang(); |
38 notification_data->body = base::UTF8ToUTF16(payload.body()); | 38 notification_data->body = base::UTF8ToUTF16(payload.body()); |
39 notification_data->tag = payload.tag(); | 39 notification_data->tag = payload.tag(); |
40 notification_data->icon = GURL(payload.icon()); | 40 notification_data->icon = GURL(payload.icon()); |
41 | |
42 for (int i = 0; i < payload.vibrate_size(); ++i) | |
Peter Beverloo
2015/04/21 17:58:23
google::protobuf::RepeatedField exposes iterators
Sanghyun Park
2015/04/23 11:08:26
I'd like to use iterators too :)
I'll modify this.
| |
43 notification_data->vibrate.push_back(payload.vibrate(i)); | |
44 | |
41 notification_data->silent = payload.silent(); | 45 notification_data->silent = payload.silent(); |
42 | 46 |
43 if (payload.data().length()) { | 47 if (payload.data().length()) { |
44 notification_data->data.assign(payload.data().begin(), | 48 notification_data->data.assign(payload.data().begin(), |
45 payload.data().end()); | 49 payload.data().end()); |
46 } | 50 } |
47 | 51 |
48 return true; | 52 return true; |
49 } | 53 } |
50 | 54 |
51 bool SerializeNotificationDatabaseData(const NotificationDatabaseData& input, | 55 bool SerializeNotificationDatabaseData(const NotificationDatabaseData& input, |
52 std::string* output) { | 56 std::string* output) { |
53 DCHECK(output); | 57 DCHECK(output); |
54 | 58 |
55 scoped_ptr<NotificationDatabaseDataProto::NotificationData> payload( | 59 scoped_ptr<NotificationDatabaseDataProto::NotificationData> payload( |
56 new NotificationDatabaseDataProto::NotificationData()); | 60 new NotificationDatabaseDataProto::NotificationData()); |
57 | 61 |
58 const PlatformNotificationData& notification_data = input.notification_data; | 62 const PlatformNotificationData& notification_data = input.notification_data; |
59 | 63 |
60 payload->set_title(base::UTF16ToUTF8(notification_data.title)); | 64 payload->set_title(base::UTF16ToUTF8(notification_data.title)); |
61 payload->set_direction( | 65 payload->set_direction( |
62 notification_data.direction == | 66 notification_data.direction == |
63 PlatformNotificationData::NotificationDirectionRightToLeft ? | 67 PlatformNotificationData::NotificationDirectionRightToLeft ? |
64 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT : | 68 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT : |
65 NotificationDatabaseDataProto::NotificationData::LEFT_TO_RIGHT); | 69 NotificationDatabaseDataProto::NotificationData::LEFT_TO_RIGHT); |
66 payload->set_lang(notification_data.lang); | 70 payload->set_lang(notification_data.lang); |
67 payload->set_body(base::UTF16ToUTF8(notification_data.body)); | 71 payload->set_body(base::UTF16ToUTF8(notification_data.body)); |
68 payload->set_tag(notification_data.tag); | 72 payload->set_tag(notification_data.tag); |
69 payload->set_icon(notification_data.icon.spec()); | 73 payload->set_icon(notification_data.icon.spec()); |
74 | |
75 for (size_t i = 0; i < notification_data.vibrate.size(); ++i) | |
76 payload->add_vibrate(notification_data.vibrate[i]); | |
77 | |
70 payload->set_silent(notification_data.silent); | 78 payload->set_silent(notification_data.silent); |
71 | 79 |
72 if (notification_data.data.size()) { | 80 if (notification_data.data.size()) { |
73 payload->set_data(¬ification_data.data.front(), | 81 payload->set_data(¬ification_data.data.front(), |
74 notification_data.data.size()); | 82 notification_data.data.size()); |
75 } | 83 } |
76 | 84 |
77 NotificationDatabaseDataProto message; | 85 NotificationDatabaseDataProto message; |
78 message.set_notification_id(input.notification_id); | 86 message.set_notification_id(input.notification_id); |
79 message.set_origin(input.origin.spec()); | 87 message.set_origin(input.origin.spec()); |
80 message.set_service_worker_registration_id( | 88 message.set_service_worker_registration_id( |
81 input.service_worker_registration_id); | 89 input.service_worker_registration_id); |
82 message.set_allocated_notification_data(payload.release()); | 90 message.set_allocated_notification_data(payload.release()); |
83 | 91 |
84 return message.SerializeToString(output); | 92 return message.SerializeToString(output); |
85 } | 93 } |
86 | 94 |
87 } // namespace content | 95 } // namespace content |
OLD | NEW |