third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

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/ServiceWorkerRegistrationNotifications.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 years 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/mediasource/MediaSource.cpp ('k') | third_party/WebKit/Source/modules/peerconnection/RTCCertificate.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

diff --git a/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp b/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

index 7b6b9930efb7a7881b9238db3615f2c291e77a98..c213a8916411d292d8ffcc041334b608e08e8bcd 100644

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

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

@@ -108,7 +108,7 @@ ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(

ScriptPromise promise = resolver->promise();

std::unique_ptr<WebNotificationShowCallbacks> callbacks =

- wrapUnique(new CallbackPromiseAdapter<void, void>(resolver));

+ WTF::wrapUnique(new CallbackPromiseAdapter<void, void>(resolver));

ServiceWorkerRegistrationNotifications::from(executionContext, registration)

.prepareShow(data, std::move(callbacks));

@@ -174,7 +174,7 @@ void ServiceWorkerRegistrationNotifications::prepareShow(

NotificationResourcesLoader* loader = new NotificationResourcesLoader(

WTF::bind(&ServiceWorkerRegistrationNotifications::didLoadResources,

wrapWeakPersistent(this), origin.release(), data,

- passed(std::move(callbacks))));

+ WTF::passed(std::move(callbacks))));

m_loaders.add(loader);

loader->start(getExecutionContext(), data);

}