Notification actions may have an icon url.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/notifications/NotificationData.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "modules/vibration/NavigatorVibration.h"
-#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 namespace {
 
 WebNotificationData::Direction toDirectionEnumValue(const String& direction)
 {
     if (direction == "ltr")
         return WebNotificationData::DirectionLeftToRight;
@@ skipping 16 matching lines @@
     WebNotificationData webData;
 
     webData.title = title;
     webData.direction = toDirectionEnumValue(options.dir());
     webData.lang = options.lang();
     webData.body = options.body();
     webData.tag = options.tag();
 
     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())
             iconUrl = KURL();
     }
 
     webData.icon = iconUrl;
     webData.vibrate = NavigatorVibration::sanitizeVibrationPattern(options.vibrate());
     webData.timestamp = options.hasTimestamp() ? static_cast<double>(options.timestamp()) : WTF::currentTimeMS();
     webData.silent = options.silent();
@@ skipping 14 matching lines @@
 
     const size_t maxActions = Notification::maxActions();
     for (const NotificationAction& action : options.actions()) {
         if (actions.size() >= maxActions)
             break;
 
         WebNotificationAction webAction;
         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;
+
         actions.append(webAction);
     }
 
     webData.actions = actions;
 
     return webData;
 }
 
 } // namespace blink