Deliver action clicks to page notifications (blink)

Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/ScopedWindowFocusAllowedIndicator.h"
 #include "core/events/Event.h"
 #include "core/frame/UseCounter.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "modules/notifications/NotificationPermissionClient.h"
+#include "modules/notifications/PageNotificationEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/notifications/WebNotificationManager.h"
 
 namespace blink {
 namespace {
@@ skipping 182 matching lines @@
     }
 }
 
 void Notification::dispatchShowEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::show));
 }
 
 void Notification::dispatchClickEvent()
 {
+    dispatchClickEvent(-1);
+}
+
+void Notification::dispatchClickEvent(int actionIndex)
+{
     UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     ScopedWindowFocusAllowedIndicator windowFocusAllowed(executionContext());
-    dispatchEvent(Event::create(EventTypeNames::click));
+    if (!RuntimeEnabledFeatures::notificationExperimentalEnabled()) {
+        // TODO(johnme): Remove this branch once actions ship.

[Peter Beverloo, 2015/08/07 07:25:25]

no need for this TODO (the code is no less obvious than the TODO)

+        dispatchEvent(Event::create(EventTypeNames::click));
+        return;
+    }
+
+    PageNotificationEventInit eventInit;
+    if (0 <= actionIndex && actionIndex < static_cast<int>(m_actions.size()))

[Peter Beverloo, 2015/08/07 07:25:25]

if (actionIndex >= 0 && actionIndex < static_cast<>())

+        eventInit.setAction(m_actions[actionIndex].action());
+    dispatchEvent(PageNotificationEvent::create(EventTypeNames::click, eventInit));
 }
 
 void Notification::dispatchErrorEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::error));
 }
 
 void Notification::dispatchCloseEvent()
 {
     // The notification will be showing when the user initiated the close, or it will be
@@ skipping 118 matching lines @@
 }
 
 DEFINE_TRACE(Notification)
 {
     visitor->trace(m_actions);
     RefCountedGarbageCollectedEventTargetWithInlineData<Notification>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink