third_party/WebKit/Source/modules/notifications/NotificationData.cpp - Issue 1620203004: Notification action icons prototype.

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: third_party/WebKit/Source/modules/notifications/NotificationData.cpp

Issue 1620203004: Notification action icons prototype. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make it work on Android and clean up. Created 4 years, 11 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

« no previous file with comments | « third_party/WebKit/Source/modules/notifications/NotificationAction.idl ('k') | third_party/WebKit/Source/modules/notifications/NotificationOptions.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/notifications/NotificationData.cpp

diff --git a/third_party/WebKit/Source/modules/notifications/NotificationData.cpp b/third_party/WebKit/Source/modules/notifications/NotificationData.cpp

index b67cd1ec28184b7fa1a0ea2d7499af9d810287be..f1ee27cef66bd2529203d56fa0a5c068cf4b885a 100644

--- a/third_party/WebKit/Source/modules/notifications/NotificationData.cpp

+++ b/third_party/WebKit/Source/modules/notifications/NotificationData.cpp

@@ -81,6 +81,15 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext

webAction.action = action.action();

webAction.title = action.title();

+ // TODO(mvanouwerkerk): Apply the appropriate CORS checks.

+ KURL iconUrl;

+ if (action.hasIcon() && !action.icon().isEmpty()) {

+ iconUrl = executionContext->completeURL(action.icon());

+ if (!iconUrl.isValid())

+ iconUrl = KURL();

+ }

+ webAction.icon = iconUrl;

actions.append(webAction);

}