Index: Source/modules/push_messaging/PushManager.cpp |
diff --git a/Source/modules/push_messaging/PushManager.cpp b/Source/modules/push_messaging/PushManager.cpp |
index 3bf7bcc1bf5eadbb6a26058654ecdb5034d2e6db..d84587e8e98484cc502c3c242aafdf41957e7328 100644 |
--- a/Source/modules/push_messaging/PushManager.cpp |
+++ b/Source/modules/push_messaging/PushManager.cpp |
@@ -16,8 +16,6 @@ |
#include "core/frame/LocalDOMWindow.h" |
#include "modules/push_messaging/PushController.h" |
#include "modules/push_messaging/PushError.h" |
-#include "modules/push_messaging/PushPermissionClient.h" |
-#include "modules/push_messaging/PushPermissionRequestCallback.h" |
#include "modules/push_messaging/PushPermissionStatusCallback.h" |
#include "modules/push_messaging/PushRegistration.h" |
#include "modules/serviceworkers/NavigatorServiceWorker.h" |
@@ -45,20 +43,13 @@ ScriptPromise PushManager::registerPushMessaging(ScriptState* scriptState) |
if (!serviceWorkerProvider) |
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(AbortError, "No Service Worker installed for this document.")); |
- // FIXME: Once everything except permission request goes through platform, |
- // delete WebPushClient and usage such as this one. |
- // See crbug.com/389194 |
WebPushClient* client = PushController::clientFrom(document->frame()); |
ASSERT(client); |
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState); |
ScriptPromise promise = resolver->promise(); |
- PushPermissionClient* permissionClient = PushPermissionClient::from(scriptState->executionContext()); |
- if (permissionClient) |
- permissionClient->requestPermission(scriptState->executionContext(), new PushPermissionRequestCallback(this, client, resolver, serviceWorkerProvider)); |
- else |
- doRegister(client, resolver, serviceWorkerProvider); |
+ client->registerPushMessaging(new CallbackPromiseAdapter<PushRegistration, PushError>(resolver), serviceWorkerProvider); |
return promise; |
} |
@@ -88,9 +79,4 @@ ScriptPromise PushManager::hasPermission(ScriptState* scriptState) |
return promise; |
} |
-void PushManager::doRegister(WebPushClient* client, PassRefPtr<ScriptPromiseResolver> resolver, WebServiceWorkerProvider* serviceWorkerProvider) |
-{ |
- client->registerPushMessaging(new CallbackPromiseAdapter<PushRegistration, PushError>(resolver), serviceWorkerProvider); |
-} |
- |
} // namespace blink |