third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h - 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/serviceworkers/ServiceWorkerContainer.h

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

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h

index 7430d2c6419976e5e170f1ed0db57bd06d5835da..63654079c2711e92f96ac92fe91b103afdb0c21e 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h

+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h

@@ -79,7 +79,7 @@ public:

void dispatchMessageEvent(WebPassOwnPtr<WebServiceWorker::Handle>, const WebString& message, const WebMessagePortChannelArray&) override;

// EventTarget overrides.

- ExecutionContext* executionContext() const override { return ContextLifecycleObserver::executionContext(); }

+ ExecutionContext* getExecutionContext() const override { return ContextLifecycleObserver::getExecutionContext(); }

const AtomicString& interfaceName() const override;

DEFINE_ATTRIBUTE_EVENT_LISTENER(controllerchange);