third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/NotificationEvent.idl ('k') | third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvas.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 a00f19d92b9a15d824950ce1d4e978c9c6b14dc4..db1353dc0f7341ab1a032ace6e0e2a38d6faefe2 100644

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

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

@@ -32,7 +32,7 @@ public:

{

HeapVector<Member<Notification>> notifications;

for (const WebPersistentNotificationInfo& notificationInfo : notificationInfos)

- notifications.append(Notification::create(resolver->executionContext(), notificationInfo.persistentId, notificationInfo.data, true /* showing */));

+ notifications.append(Notification::create(resolver->getExecutionContext(), notificationInfo.persistentId, notificationInfo.data, true /* showing */));

return notifications;

}

@@ -45,7 +45,7 @@ private:

ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptState* scriptState, ServiceWorkerRegistration& serviceWorkerRegistration, const String& title, const NotificationOptions& options, ExceptionState& exceptionState)

{

- ExecutionContext* executionContext = scriptState->executionContext();

+ ExecutionContext* executionContext = scriptState->getExecutionContext();

// If context object's active worker is null, reject promise with a TypeError exception.

if (!serviceWorkerRegistration.active())

@@ -69,7 +69,7 @@ ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptSta

WebNotificationShowCallbacks* callbacks = new CallbackPromiseAdapter<void, void>(resolver);

- SecurityOrigin* origin = executionContext->securityOrigin();

+ SecurityOrigin* origin = executionContext->getSecurityOrigin();

WebNotificationManager* notificationManager = Platform::current()->notificationManager();

ASSERT(notificationManager);