third_party/WebKit/Source/modules/notifications/NotificationData.cpp - Issue 1855443002: Implement receiving side of web notification inline replies

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1855443002: Implement receiving side of web notification inline replies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added test and removed unnecessary code. Created 4 years, 8 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

« no previous file with comments | « third_party/WebKit/Source/modules/notifications/NotificationAction.idl ('k') | third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ed67c9e3882698816287013ef69bab0c2bbc438d..60a86876e6e384665d18932fe54e34e4a7943190 100644

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

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

@@ -93,6 +93,20 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext

webAction.action = action.action();

webAction.title = action.title();

+ if (action.type() == "button")

+ webAction.type = WebNotificationAction::Button;

+ else if (action.type() == "text")

+ webAction.type = WebNotificationAction::Text;

+ else

+ NOTREACHED() << "Unknown action type: " << action.type();

+ if (action.hasPlaceholder() && webAction.type == WebNotificationAction::Button) {

+ exceptionState.throwTypeError("Notifications of type \"button\" cannot specify a placeholder.");

+ return WebNotificationData();

+ }

+ webAction.placeholder = action.placeholder();

if (action.hasIcon() && !action.icon().isEmpty())

webAction.icon = completeURL(executionContext, action.icon());