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

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

Issue 1750083004: Add badge to web notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 4 years, 9 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 23 matching lines...) Expand all
34 break; 34 break;
35 case WebNotificationData::DirectionAuto: 35 case WebNotificationData::DirectionAuto:
36 platform_data.direction = PlatformNotificationData::DIRECTION_AUTO; 36 platform_data.direction = PlatformNotificationData::DIRECTION_AUTO;
37 break; 37 break;
38 } 38 }
39 39
40 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang)); 40 platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang));
41 platform_data.body = web_data.body; 41 platform_data.body = web_data.body;
42 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag)); 42 platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag));
43 platform_data.icon = blink::WebStringToGURL(web_data.icon.string()); 43 platform_data.icon = blink::WebStringToGURL(web_data.icon.string());
44 platform_data.badge = blink::WebStringToGURL(web_data.badge.string());
44 platform_data.vibration_pattern.assign(web_data.vibrate.begin(), 45 platform_data.vibration_pattern.assign(web_data.vibrate.begin(),
45 web_data.vibrate.end()); 46 web_data.vibrate.end());
46 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp); 47 platform_data.timestamp = base::Time::FromJsTime(web_data.timestamp);
47 platform_data.renotify = web_data.renotify; 48 platform_data.renotify = web_data.renotify;
48 platform_data.silent = web_data.silent; 49 platform_data.silent = web_data.silent;
49 platform_data.require_interaction = web_data.requireInteraction; 50 platform_data.require_interaction = web_data.requireInteraction;
50 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());
51 platform_data.actions.resize(web_data.actions.size()); 52 platform_data.actions.resize(web_data.actions.size());
52 for (size_t i = 0; i < web_data.actions.size(); ++i) { 53 for (size_t i = 0; i < web_data.actions.size(); ++i) {
53 platform_data.actions[i].action = 54 platform_data.actions[i].action =
(...skipping 20 matching lines...) Expand all
74 break; 75 break;
75 case PlatformNotificationData::DIRECTION_AUTO: 76 case PlatformNotificationData::DIRECTION_AUTO:
76 web_data.direction = WebNotificationData::DirectionAuto; 77 web_data.direction = WebNotificationData::DirectionAuto;
77 break; 78 break;
78 } 79 }
79 80
80 web_data.lang = blink::WebString::fromUTF8(platform_data.lang); 81 web_data.lang = blink::WebString::fromUTF8(platform_data.lang);
81 web_data.body = platform_data.body; 82 web_data.body = platform_data.body;
82 web_data.tag = blink::WebString::fromUTF8(platform_data.tag); 83 web_data.tag = blink::WebString::fromUTF8(platform_data.tag);
83 web_data.icon = blink::WebURL(platform_data.icon); 84 web_data.icon = blink::WebURL(platform_data.icon);
85 web_data.badge = blink::WebURL(platform_data.badge);
84 web_data.vibrate = platform_data.vibration_pattern; 86 web_data.vibrate = platform_data.vibration_pattern;
85 web_data.timestamp = platform_data.timestamp.ToJsTime(); 87 web_data.timestamp = platform_data.timestamp.ToJsTime();
86 web_data.renotify = platform_data.renotify; 88 web_data.renotify = platform_data.renotify;
87 web_data.silent = platform_data.silent; 89 web_data.silent = platform_data.silent;
88 web_data.requireInteraction = platform_data.require_interaction; 90 web_data.requireInteraction = platform_data.require_interaction;
89 web_data.data = platform_data.data; 91 web_data.data = platform_data.data;
90 blink::WebVector<blink::WebNotificationAction> resized( 92 blink::WebVector<blink::WebNotificationAction> resized(
91 platform_data.actions.size()); 93 platform_data.actions.size());
92 web_data.actions.swap(resized); 94 web_data.actions.swap(resized);
93 for (size_t i = 0; i < platform_data.actions.size(); ++i) { 95 for (size_t i = 0; i < platform_data.actions.size(); ++i) {
94 web_data.actions[i].action = 96 web_data.actions[i].action =
95 blink::WebString::fromUTF8(platform_data.actions[i].action); 97 blink::WebString::fromUTF8(platform_data.actions[i].action);
96 web_data.actions[i].title = platform_data.actions[i].title; 98 web_data.actions[i].title = platform_data.actions[i].title;
97 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon); 99 web_data.actions[i].icon = blink::WebURL(platform_data.actions[i].icon);
98 } 100 }
99 101
100 return web_data; 102 return web_data;
101 } 103 }
102 104
103 } // namespace content 105 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698