content/child/notifications/notification_data_conversions.cc - Issue 2261283002: Add Notification images (Blink + desktop implementation)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/child/notifications/notification_data_conversions.cc

Issue 2261283002: Add Notification images (Blink + desktop implementation) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 side-by-side diff with in-line comments

Download patch

« content/browser/notifications/notification_message_filter.cc ('K') | « content/browser/notifications/type_converters_unittest.cc ('k') | content/child/notifications/notification_data_conversions_unittest.cc » ('j') | third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/notifications/notification_data_conversions.cc

diff --git a/content/child/notifications/notification_data_conversions.cc b/content/child/notifications/notification_data_conversions.cc

index be49a7a0a84de5f7e556caa2fc302a381b2fc7f5..3e28497f81823af8c9f9c83fd9c779a3b74ab436 100644

--- a/content/child/notifications/notification_data_conversions.cc

+++ b/content/child/notifications/notification_data_conversions.cc

@@ -40,6 +40,7 @@ PlatformNotificationData ToPlatformNotificationData(

platform_data.lang = base::UTF16ToUTF8(base::StringPiece16(web_data.lang));

platform_data.body = web_data.body;

platform_data.tag = base::UTF16ToUTF8(base::StringPiece16(web_data.tag));

+ platform_data.image = blink::WebStringToGURL(web_data.image.string());

platform_data.icon = blink::WebStringToGURL(web_data.icon.string());

platform_data.badge = blink::WebStringToGURL(web_data.badge.string());

platform_data.vibration_pattern.assign(web_data.vibrate.begin(),

@@ -94,6 +95,7 @@ WebNotificationData ToWebNotificationData(

web_data.lang = blink::WebString::fromUTF8(platform_data.lang);

web_data.body = platform_data.body;

web_data.tag = blink::WebString::fromUTF8(platform_data.tag);

+ web_data.image = blink::WebURL(platform_data.image);

web_data.icon = blink::WebURL(platform_data.icon);

web_data.badge = blink::WebURL(platform_data.badge);

web_data.vibrate = platform_data.vibration_pattern;