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

Unified Diff: Source/modules/notifications/Notification.h

Issue 1263043002: Add NotificationOptions.actions so websites can provide buttons (blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tweak SW test Created 5 years, 5 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: Source/modules/notifications/Notification.h
diff --git a/Source/modules/notifications/Notification.h b/Source/modules/notifications/Notification.h
index 86b7fcb0d3cd31e4babf734ffceb4e913efc3fc7..154c0d73f99960f942829ba29c3c8a177f9e531b 100644
--- a/Source/modules/notifications/Notification.h
+++ b/Source/modules/notifications/Notification.h
@@ -35,11 +35,14 @@
#include "core/dom/ActiveDOMObject.h"
#include "modules/EventTargetModules.h"
#include "modules/ModulesExport.h"
+#include "modules/notifications/NotificationAction.h"
#include "modules/vibration/NavigatorVibration.h"
#include "platform/AsyncMethodRunner.h"
#include "platform/heap/Handle.h"
#include "platform/text/TextDirection.h"
#include "platform/weborigin/KURL.h"
+#include "public/platform/WebVector.h"
+#include "public/platform/modules/notifications/WebNotificationAction.h"
#include "public/platform/modules/notifications/WebNotificationDelegate.h"
#include "public/platform/modules/notifications/WebNotificationPermission.h"
#include "wtf/PassOwnPtr.h"
@@ -90,9 +93,10 @@ public:
String body() const { return m_body; }
String tag() const { return m_tag; }
String icon() const { return m_iconUrl; }
- NavigatorVibration::VibrationPattern vibrate(bool& isNull) const;
+ const NavigatorVibration::VibrationPattern& vibrate(bool& isNull) const;
bool silent() const { return m_silent; }
ScriptValue data(ScriptState*) const;
+ const HeapVector<NotificationAction>& actions() const { return m_actions; }
TextDirection direction() const;
KURL iconURL() const { return m_iconUrl; }
@@ -105,6 +109,8 @@ public:
static unsigned maxActions();
+ static void actionsToWebActions(const HeapVector<NotificationAction>& actions, WebVector<WebNotificationAction>* webActions);
+
// EventTarget interface.
ExecutionContext* executionContext() const final { return ActiveDOMObject::executionContext(); }
const AtomicString& interfaceName() const override;
@@ -120,6 +126,8 @@ protected:
bool dispatchEventInternal(PassRefPtrWillBeRawPtr<Event>) final;
private:
+ static void webActionsToActions(const WebVector<WebNotificationAction>& webActions, HeapVector<NotificationAction>* actions);
+
Notification(const String& title, ExecutionContext*);
void scheduleShow();
@@ -139,10 +147,10 @@ private:
void setVibrate(const NavigatorVibration::VibrationPattern& vibrate) { m_vibrate = vibrate; }
void setSilent(bool silent) { m_silent = silent; }
void setSerializedData(PassRefPtr<SerializedScriptValue> data) { m_serializedData = data; }
+ void setActions(const HeapVector<NotificationAction>& actions) { m_actions = actions; }
void setPersistentId(int64_t persistentId) { m_persistentId = persistentId; }
-private:
String m_title;
String m_dir;
String m_lang;
@@ -151,6 +159,7 @@ private:
NavigatorVibration::VibrationPattern m_vibrate;
bool m_silent;
RefPtr<SerializedScriptValue> m_serializedData;
+ HeapVector<NotificationAction> m_actions;
KURL m_iconUrl;

Powered by Google App Engine
This is Rietveld 408576698