Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: third_party/WebKit/Source/modules/push_messaging/PushManager.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
Index: third_party/WebKit/Source/modules/push_messaging/PushManager.cpp
diff --git a/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp b/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp
index 0f5a2ffd66ddd641444c5580ef3b4c3273ccc98d..3233758e0725acb9235c8a185748539a12f560c4 100644
--- a/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp
+++ b/third_party/WebKit/Source/modules/push_messaging/PushManager.cpp
@@ -60,8 +60,8 @@ ScriptPromise PushManager::subscribe(ScriptState* scriptState, const PushSubscri
// The document context is the only reasonable context from which to ask the user for permission
// to use the Push API. The embedder should persist the permission so that later calls in
// different contexts can succeed.
- if (scriptState->executionContext()->isDocument()) {
- Document* document = toDocument(scriptState->executionContext());
+ if (scriptState->getExecutionContext()->isDocument()) {
+ Document* document = toDocument(scriptState->getExecutionContext());
if (!document->domWindow() || !document->frame())
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Document is detached from window."));
PushController::clientFrom(document->frame()).subscribe(m_registration->webRegistration(), toWebPushSubscriptionOptions(options), new PushSubscriptionCallbacks(resolver, m_registration));
@@ -83,8 +83,8 @@ ScriptPromise PushManager::getSubscription(ScriptState* scriptState)
ScriptPromise PushManager::permissionState(ScriptState* scriptState, const PushSubscriptionOptions& options)
{
- if (scriptState->executionContext()->isDocument()) {
- Document* document = toDocument(scriptState->executionContext());
+ if (scriptState->getExecutionContext()->isDocument()) {
+ Document* document = toDocument(scriptState->getExecutionContext());
if (!document->domWindow() || !document->frame())
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Document is detached from window."));
}

Powered by Google App Engine
This is Rietveld 408576698