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

Unified Diff: third_party/WebKit/Source/modules/notifications/NotificationData.cpp

Issue 1644573002: Notification actions may have an icon url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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..733068b7a0fc0ead1b00404500940189c4422a3d 100644
--- a/third_party/WebKit/Source/modules/notifications/NotificationData.cpp
+++ b/third_party/WebKit/Source/modules/notifications/NotificationData.cpp
@@ -47,7 +47,6 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext
KURL iconUrl;
- // TODO(peter): Apply the appropriate CORS checks on the |iconUrl|.
if (options.hasIcon() && !options.icon().isEmpty()) {
iconUrl = executionContext->completeURL(options.icon());
if (!iconUrl.isValid())
@@ -81,6 +80,16 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext
webAction.action = action.action();
webAction.title = action.title();
+ if (RuntimeEnabledFeatures::notificationExperimentalEnabled()) {
Peter Beverloo 2016/01/27 13:24:45 We don't need this check anymore, the bindings fol
Michael van Ouwerkerk 2016/01/27 14:24:32 Oh look at that. Nice.
+ KURL iconUrl;
+ if (action.hasIcon() && !action.icon().isEmpty()) {
+ iconUrl = executionContext->completeURL(action.icon());
+ if (!iconUrl.isValid())
+ iconUrl = KURL();
+ }
+ webAction.icon = iconUrl;
+ }
+
actions.append(webAction);
}

Powered by Google App Engine
This is Rietveld 408576698