third_party/WebKit/Source/web/NotificationPermissionClientImpl.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/web/NotificationPermissionClientImpl.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/web/IndexedDBClientImpl.cpp ('k') | third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp b/third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp

index 60c4c985bbf05edefbeb44199fe86ba10b829acb..9334e3f8851cd07f7ca8031d9332bf8445e3712d 100644

--- a/third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp

+++ b/third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp

@@ -61,7 +61,7 @@ ScriptPromise NotificationPermissionClientImpl::requestPermission(ScriptState* s

{

ASSERT(scriptState);

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

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

ASSERT(context && context->isDocument());

Document* document = toDocument(context);

@@ -70,7 +70,7 @@ ScriptPromise NotificationPermissionClientImpl::requestPermission(ScriptState* s

ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

- webFrame->client()->requestNotificationPermission(WebSecurityOrigin(context->securityOrigin()), new WebNotificationPermissionCallbackImpl(resolver, deprecatedCallback));

+ webFrame->client()->requestNotificationPermission(WebSecurityOrigin(context->getSecurityOrigin()), new WebNotificationPermissionCallbackImpl(resolver, deprecatedCallback));

return promise;

}