Reland of Remove content::NotificationPermissionDispatcher.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/notifications/NotificationManager.h"
 
+#include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "bindings/core/v8/ScriptState.h"
+#include "modules/notifications/Notification.h"
+#include "modules/notifications/NotificationPermissionCallback.h"
+#include "modules/permissions/Permissions.h"
+#include "platform/UserGestureIndicator.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
+#include "public/platform/modules/permissions/permission.mojom-blink.h"
 #include "public/platform/modules/permissions/permission_status.mojom-blink.h"
+#include "wtf/Functional.h"
 
 namespace blink {
 
 // static
 NotificationManager* NotificationManager::from(ExecutionContext* executionContext)
 {
     DCHECK(executionContext);
     DCHECK(executionContext->isContextThread());
 
     NotificationManager* manager = static_cast<NotificationManager*>(Supplement<ExecutionContext>::from(executionContext, supplementName()));
     if (!manager) {
         manager = new NotificationManager(executionContext);
         Supplement<ExecutionContext>::provideTo(*executionContext, supplementName(), manager);
     }
 
     return manager;
 }
 
 // static
 const char* NotificationManager::supplementName()
 {
     return "NotificationManager";
 }
 
 NotificationManager::NotificationManager(ExecutionContext* executionContext)
     : ContextLifecycleObserver(executionContext)
 {
-    Platform::current()->interfaceProvider()->getInterface(mojo::GetProxy(&m_service));
 }
 
 NotificationManager::~NotificationManager()
 {
 }
 
-mojom::blink::PermissionStatus NotificationManager::permissionStatus() const
+mojom::blink::PermissionStatus NotificationManager::permissionStatus()
 {
+    if (!m_notificationService)
+        Platform::current()->interfaceProvider()->getInterface(mojo::GetProxy(&m_notificationService));
+
     mojom::blink::PermissionStatus permissionStatus;
-
-    const bool result =
-        m_service->GetPermissionStatus(getExecutionContext()->getSecurityOrigin()->toString(), &permissionStatus);
+    const bool result = m_notificationService->GetPermissionStatus(getExecutionContext()->getSecurityOrigin()->toString(), &permissionStatus);
     DCHECK(result);
 
     return permissionStatus;
 }
 
+ScriptPromise NotificationManager::requestPermission(ScriptState* scriptState, NotificationPermissionCallback* deprecatedCallback)
+{
+    ExecutionContext* context = scriptState->getExecutionContext();
+
+    if (!m_permissionService) {
+        Permissions::connectToService(context, mojo::GetProxy(&m_permissionService));
+        m_permissionService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&NotificationManager::onPermissionServiceConnectionError, wrapWeakPersistent(this))));
+    }
+
+    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+    ScriptPromise promise = resolver->promise();
+
+    m_permissionService->RequestPermission(
+        mojom::blink::PermissionName::NOTIFICATIONS, context->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(),
+        convertToBaseCallback(WTF::bind(&NotificationManager::onPermissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver), wrapPersistent(deprecatedCallback))));
+
+    return promise;
+}
+
 void NotificationManager::contextDestroyed()
 {
-    m_service.reset();
+    m_notificationService.reset();
+    m_permissionService.reset();
+}
+
+void NotificationManager::onPermissionRequestComplete(ScriptPromiseResolver* resolver, NotificationPermissionCallback* deprecatedCallback, mojom::blink::PermissionStatus status)
+{
+    String statusString = Notification::permissionString(status);
+    if (deprecatedCallback)
+        deprecatedCallback->handleEvent(statusString);
+
+    resolver->resolve(statusString);
+}
+
+void NotificationManager::onPermissionServiceConnectionError()
+{
+    m_permissionService.reset();

[haraken, 2016/08/20 01:34:38]

Don't we need to reset m_notificationService as well?

[Reilly Grant (use Gerrit), 2016/08/22 18:17:33]

It doesn't matter for m_notificationService because the call made in
permissionStatus() is synchronous and so there isn't the possibility of an
outstanding callback during renderer shutdown.

 }
 
 DEFINE_TRACE(NotificationManager)
 {
     ContextLifecycleObserver::trace(visitor);
     Supplement<ExecutionContext>::trace(visitor);
 }
 
 } // namespace blink