Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(613)

Side by Side Diff: content/browser/notifications/notification_database_data_conversions.cc

Issue 1262023003: Serialize Notification.direction == "auto" in the database (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 11 matching lines...) Expand all
22 output->notification_id = message.notification_id(); 22 output->notification_id = message.notification_id();
23 output->origin = GURL(message.origin()); 23 output->origin = GURL(message.origin());
24 output->service_worker_registration_id = 24 output->service_worker_registration_id =
25 message.service_worker_registration_id(); 25 message.service_worker_registration_id();
26 26
27 PlatformNotificationData* notification_data = &output->notification_data; 27 PlatformNotificationData* notification_data = &output->notification_data;
28 const NotificationDatabaseDataProto::NotificationData& payload = 28 const NotificationDatabaseDataProto::NotificationData& payload =
29 message.notification_data(); 29 message.notification_data();
30 30
31 notification_data->title = base::UTF8ToUTF16(payload.title()); 31 notification_data->title = base::UTF8ToUTF16(payload.title());
32 notification_data->direction = 32
33 payload.direction() == 33 switch (payload.direction()) {
34 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT ? 34 case NotificationDatabaseDataProto::NotificationData::LEFT_TO_RIGHT:
35 PlatformNotificationData::NotificationDirectionRightToLeft : 35 notification_data->direction =
36 PlatformNotificationData::NotificationDirectionLeftToRight; 36 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
37 break;
38 case NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT:
39 notification_data->direction =
40 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT;
41 break;
42 case NotificationDatabaseDataProto::NotificationData::AUTO:
43 notification_data->direction = PlatformNotificationData::DIRECTION_AUTO;
44 break;
45 }
46
37 notification_data->lang = payload.lang(); 47 notification_data->lang = payload.lang();
38 notification_data->body = base::UTF8ToUTF16(payload.body()); 48 notification_data->body = base::UTF8ToUTF16(payload.body());
39 notification_data->tag = payload.tag(); 49 notification_data->tag = payload.tag();
40 notification_data->icon = GURL(payload.icon()); 50 notification_data->icon = GURL(payload.icon());
41 51
42 if (payload.vibration_pattern().size() > 0) { 52 if (payload.vibration_pattern().size() > 0) {
43 notification_data->vibration_pattern.assign( 53 notification_data->vibration_pattern.assign(
44 payload.vibration_pattern().begin(), 54 payload.vibration_pattern().begin(),
45 payload.vibration_pattern().end()); 55 payload.vibration_pattern().end());
46 } 56 }
(...skipping 11 matching lines...) Expand all
58 bool SerializeNotificationDatabaseData(const NotificationDatabaseData& input, 68 bool SerializeNotificationDatabaseData(const NotificationDatabaseData& input,
59 std::string* output) { 69 std::string* output) {
60 DCHECK(output); 70 DCHECK(output);
61 71
62 scoped_ptr<NotificationDatabaseDataProto::NotificationData> payload( 72 scoped_ptr<NotificationDatabaseDataProto::NotificationData> payload(
63 new NotificationDatabaseDataProto::NotificationData()); 73 new NotificationDatabaseDataProto::NotificationData());
64 74
65 const PlatformNotificationData& notification_data = input.notification_data; 75 const PlatformNotificationData& notification_data = input.notification_data;
66 76
67 payload->set_title(base::UTF16ToUTF8(notification_data.title)); 77 payload->set_title(base::UTF16ToUTF8(notification_data.title));
68 payload->set_direction( 78
69 notification_data.direction == 79 switch (notification_data.direction) {
70 PlatformNotificationData::NotificationDirectionRightToLeft ? 80 case PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT:
71 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT : 81 payload->set_direction(
72 NotificationDatabaseDataProto::NotificationData::LEFT_TO_RIGHT); 82 NotificationDatabaseDataProto::NotificationData::LEFT_TO_RIGHT);
83 break;
84 case PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT:
85 payload->set_direction(
86 NotificationDatabaseDataProto::NotificationData::RIGHT_TO_LEFT);
87 break;
88 case PlatformNotificationData::DIRECTION_AUTO:
89 payload->set_direction(
90 NotificationDatabaseDataProto::NotificationData::AUTO);
91 break;
92 }
93
73 payload->set_lang(notification_data.lang); 94 payload->set_lang(notification_data.lang);
74 payload->set_body(base::UTF16ToUTF8(notification_data.body)); 95 payload->set_body(base::UTF16ToUTF8(notification_data.body));
75 payload->set_tag(notification_data.tag); 96 payload->set_tag(notification_data.tag);
76 payload->set_icon(notification_data.icon.spec()); 97 payload->set_icon(notification_data.icon.spec());
77 98
78 for (size_t i = 0; i < notification_data.vibration_pattern.size(); ++i) 99 for (size_t i = 0; i < notification_data.vibration_pattern.size(); ++i)
79 payload->add_vibration_pattern(notification_data.vibration_pattern[i]); 100 payload->add_vibration_pattern(notification_data.vibration_pattern[i]);
80 101
81 payload->set_silent(notification_data.silent); 102 payload->set_silent(notification_data.silent);
82 103
83 if (notification_data.data.size()) { 104 if (notification_data.data.size()) {
84 payload->set_data(&notification_data.data.front(), 105 payload->set_data(&notification_data.data.front(),
85 notification_data.data.size()); 106 notification_data.data.size());
86 } 107 }
87 108
88 NotificationDatabaseDataProto message; 109 NotificationDatabaseDataProto message;
89 message.set_notification_id(input.notification_id); 110 message.set_notification_id(input.notification_id);
90 message.set_origin(input.origin.spec()); 111 message.set_origin(input.origin.spec());
91 message.set_service_worker_registration_id( 112 message.set_service_worker_registration_id(
92 input.service_worker_registration_id); 113 input.service_worker_registration_id);
93 message.set_allocated_notification_data(payload.release()); 114 message.set_allocated_notification_data(payload.release());
94 115
95 return message.SerializeToString(output); 116 return message.SerializeToString(output);
96 } 117 }
97 118
98 } // namespace content 119 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698