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

Side by Side Diff: content/child/notifications/notification_data_conversions.cc

Issue 1855443002: Implement receiving side of web notification inline replies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added test and removed unnecessary code. Created 4 years, 8 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 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 platform_data.badge = blink::WebStringToGURL(web_data.badge.string()); 44 platform_data.badge = blink::WebStringToGURL(web_data.badge.string());
45 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), 45 platform_data.vibration_pattern.assign(web_data.vibrate.begin(),
46 web_data.vibrate.end()); 46 web_data.vibrate.end());
47 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp); 47 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp);
48 platform_data.renotify = web_data.renotify; 48 platform_data.renotify = web_data.renotify;
49 platform_data.silent = web_data.silent; 49 platform_data.silent = web_data.silent;
50 platform_data.require_interaction = web_data.requireInteraction; 50 platform_data.require_interaction = web_data.requireInteraction;
51 platform_data.data.assign(web_data.data.begin(), web_data.data.end()); 51 platform_data.data.assign(web_data.data.begin(), web_data.data.end());
52 platform_data.actions.resize(web_data.actions.size()); 52 platform_data.actions.resize(web_data.actions.size());
53 for (size_t i = 0; i < web_data.actions.size(); ++i) { 53 for (size_t i = 0; i < web_data.actions.size(); ++i) {
54 switch (web_data.actions[i].type) {
55 case blink::WebNotificationAction::Button:
56 platform_data.actions[i].type =
57 PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON;
58 break;
59 case blink::WebNotificationAction::Text:
60 platform_data.actions[i].type = PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT;
61 break;
62 default:
63 NOTREACHED() << "Unknown notification action type: "
64 << web_data.actions[i].type;
65 }
54 platform_data.actions[i].action = 66 platform_data.actions[i].action =
55 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action)); 67 base::UTF16ToUTF8(base::StringPiece16(web_data.actions[i].action));
56 platform_data.actions[i].title = web_data.actions[i].title; 68 platform_data.actions[i].title = web_data.actions[i].title;
57 platform_data.actions[i].icon = 69 platform_data.actions[i].icon =
58 blink::WebStringToGURL(web_data.actions[i].icon.string()); 70 blink::WebStringToGURL(web_data.actions[i].icon.string());
71 platform_data.actions[i].placeholder = web_data.actions[i].placeholder;
59 } 72 }
60 73
61 return platform_data; 74 return platform_data;
62 } 75 }
63 76
64 WebNotificationData ToWebNotificationData( 77 WebNotificationData ToWebNotificationData(
65 const PlatformNotificationData& platform_data) { 78 const PlatformNotificationData& platform_data) {
66 WebNotificationData web_data; 79 WebNotificationData web_data;
67 web_data.title = platform_data.title; 80 web_data.title = platform_data.title;
68 81
(...skipping 17 matching lines...) Expand all
86 web_data.vibrate = platform_data.vibration_pattern; 99 web_data.vibrate = platform_data.vibration_pattern;
87 web_data.timestamp = platform_data.timestamp.ToJsTime(); 100 web_data.timestamp = platform_data.timestamp.ToJsTime();
88 web_data.renotify = platform_data.renotify; 101 web_data.renotify = platform_data.renotify;
89 web_data.silent = platform_data.silent; 102 web_data.silent = platform_data.silent;
90 web_data.requireInteraction = platform_data.require_interaction; 103 web_data.requireInteraction = platform_data.require_interaction;
91 web_data.data = platform_data.data; 104 web_data.data = platform_data.data;
92 blink::WebVector<blink::WebNotificationAction> resized( 105 blink::WebVector<blink::WebNotificationAction> resized(
93 platform_data.actions.size()); 106 platform_data.actions.size());
94 web_data.actions.swap(resized); 107 web_data.actions.swap(resized);
95 for (size_t i = 0; i < platform_data.actions.size(); ++i) { 108 for (size_t i = 0; i < platform_data.actions.size(); ++i) {
109 switch (platform_data.actions[i].type) {
110 case PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON:
111 web_data.actions[i].type = blink::WebNotificationAction::Button;
112 break;
113 case PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT:
114 web_data.actions[i].type = blink::WebNotificationAction::Text;
115 break;
116 default:
117 NOTREACHED() << "Unknown platform data type: "
118 << platform_data.actions[i].type;
119 }
96 web_data.actions[i].action = 120 web_data.actions[i].action =
97 blink::WebString::fromUTF8(platform_data.actions[i].action); 121 blink::WebString::fromUTF8(platform_data.actions[i].action);
98 web_data.actions[i].title = platform_data.actions[i].title; 122 web_data.actions[i].title = platform_data.actions[i].title;
99 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); 123 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon);
124 web_data.actions[i].placeholder = platform_data.actions[i].placeholder;
100 } 125 }
101 126
102 return web_data; 127 return web_data;
103 } 128 }
104 129
105 } // namespace content 130 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698