Remove content::NotificationPermissionDispatcher.

third_party/WebKit/Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/notifications/Notification.h"
 
 #include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/modules/v8/V8NotificationAction.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/ScopedWindowFocusAllowedIndicator.h"
 #include "core/events/Event.h"
 #include "core/frame/UseCounter.h"
 #include "modules/notifications/NotificationAction.h"
 #include "modules/notifications/NotificationData.h"
 #include "modules/notifications/NotificationManager.h"
 #include "modules/notifications/NotificationOptions.h"
-#include "modules/notifications/NotificationPermissionClient.h"
+#include "modules/notifications/NotificationPermissionCallback.h"
 #include "modules/notifications/NotificationResourcesLoader.h"
+#include "modules/permissions/Permissions.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebSecurityOrigin.h"
-#include "public/platform/WebString.h"
 #include "public/platform/modules/notifications/WebNotificationAction.h"
 #include "public/platform/modules/notifications/WebNotificationConstants.h"
 #include "public/platform/modules/notifications/WebNotificationManager.h"
-#include "public/platform/modules/permissions/permission_status.mojom-blink.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 namespace {
 
 const int64_t kInvalidPersistentId = -1;
 
 WebNotificationManager* notificationManager()
 {
@@ skipping 280 matching lines @@
 }
 
 String Notification::permission(ExecutionContext* context)
 {
     return permissionString(NotificationManager::from(context)->permissionStatus());
 }
 
 ScriptPromise Notification::requestPermission(ScriptState* scriptState, NotificationPermissionCallback* deprecatedCallback)
 {
     ExecutionContext* context = scriptState->getExecutionContext();
-    if (NotificationPermissionClient* permissionClient = NotificationPermissionClient::from(context))
-        return permissionClient->requestPermission(scriptState, deprecatedCallback);
 
-    // The context has been detached. Return a promise that will never settle.
-    DCHECK(context->activeDOMObjectsAreStopped());
+    mojom::blink::PermissionServicePtr permissionService;
+    Permissions::connectToService(context, mojo::GetProxy(&permissionService));

[haraken, 2016/08/13 01:54:32]

I'd prefer connecting to the service in the constructor and save it to
m_permissionService.

Currently m_permissionService is unused.

[Reilly Grant (use Gerrit), 2016/08/15 17:55:01]

I forgot to remove it. This is a static function so it cannot access
m_permissionService. I should perhaps move m_permissionService into
NotificationManager so that the connection is persisted there.

 
-    return ScriptPromise();
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromise promise = resolver->promise();
+
+    mojom::blink::PermissionService* rawPermissionService = permissionService.get();
+    rawPermissionService->RequestPermission(
+        mojom::blink::PermissionName::NOTIFICATIONS, context->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(),
+        convertToBaseCallback(WTF::bind(&Notification::onPermissionRequestComplete, passed(std::move(permissionService)), wrapPersistent(resolver), wrapPersistent(deprecatedCallback))));

[haraken, 2016/08/13 01:54:32]

Instead of moving the ownership of the service, I'd prefer keeping it in
m_permissionService.

+
+    return promise;
 }
 
 size_t Notification::maxActions()
 {
     return kWebNotificationMaxActions;
 }
 
 DispatchEventResult Notification::dispatchEventInternal(Event* event)
 {
     DCHECK(getExecutionContext()->isContextThread());
@@ skipping 15 matching lines @@
 
     if (m_loader)
         m_loader->stop();
 }
 
 bool Notification::hasPendingActivity() const
 {
     return m_state == NotificationStateShowing || m_prepareShowMethodRunner->isActive() || m_loader;
 }
 
+void Notification::onPermissionRequestComplete(mojom::blink::PermissionServicePtr permissionService, ScriptPromiseResolver* resolver, NotificationPermissionCallback* deprecatedCallback, mojom::blink::PermissionStatus status)
+{
+    String statusString = permissionString(status);
+    if (deprecatedCallback)
+        deprecatedCallback->handleEvent(statusString);
+
+    resolver->resolve(statusString);
+}
+
 DEFINE_TRACE(Notification)
 {
     visitor->trace(m_prepareShowMethodRunner);
     visitor->trace(m_loader);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink