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..caee4f1312c88c4d2248c8fbe2e12688d5f4fd57 100644 |
--- a/third_party/WebKit/Source/modules/notifications/NotificationData.cpp |
+++ b/third_party/WebKit/Source/modules/notifications/NotificationData.cpp |
@@ -11,7 +11,6 @@ |
#include "modules/notifications/Notification.h" |
#include "modules/notifications/NotificationOptions.h" |
#include "modules/vibration/NavigatorVibration.h" |
-#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/weborigin/KURL.h" |
namespace blink { |
@@ -47,7 +46,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 +79,14 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext |
webAction.action = action.action(); |
webAction.title = action.title(); |
+ KURL iconUrl; |
+ if (action.hasIcon() && !action.icon().isEmpty()) { |
+ iconUrl = executionContext->completeURL(action.icon()); |
+ if (!iconUrl.isValid()) |
+ iconUrl = KURL(); |
+ } |
+ webAction.icon = iconUrl; |
Peter Beverloo
2016/01/27 17:14:23
PTAL at third_party/WebKit/Source/modules/notifica
Michael van Ouwerkerk
2016/02/01 14:39:23
Done.
|
+ |
actions.append(webAction); |
} |