Introduce the Blink NotificationService, move permission checks there

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 23 matching lines @@
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.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/NotificationResourcesLoader.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.h"

[esprehn, 2016/05/12 21:03:47]

.mojom-blink.h, you want to use the blink style bindings.

[Peter Beverloo, 2016/05/13 15:10:12]

Done.

 #include "wtf/Functional.h"
 
 namespace blink {
 namespace {
 
 const int64_t kInvalidPersistentId = -1;
 
 WebNotificationManager* notificationManager()
 {
     return Platform::current()->notificationManager();
@@ skipping 72 matching lines @@
 {
     ASSERT(m_state == NotificationStateIdle);
     ASSERT(!m_prepareShowMethodRunner->isActive());
 
     m_prepareShowMethodRunner->runAsync();
 }
 
 void Notification::prepareShow()
 {
     ASSERT(m_state == NotificationStateIdle);
-    if (Notification::checkPermission(getExecutionContext()) != mojom::PermissionStatus::GRANTED) {
+    if (NotificationManager::from(getExecutionContext())->permissionStatus() != mojom::PermissionStatus::GRANTED) {
         dispatchErrorEvent();
         return;
     }
 
     m_loader = new NotificationResourcesLoader(bind<NotificationResourcesLoader*>(&Notification::didLoadResources, WeakPersistentThisPointer<Notification>(this)));
     m_loader->start(getExecutionContext(), m_data);
 }
 
 void Notification::didLoadResources(NotificationResourcesLoader* loader)
 {
@@ skipping 185 matching lines @@
     case mojom::PermissionStatus::ASK:
         return "default";
     }
 
     ASSERT_NOT_REACHED();
     return "denied";
 }
 
 String Notification::permission(ExecutionContext* context)
 {
-    return permissionString(checkPermission(context));
-}
-
-mojom::PermissionStatus Notification::checkPermission(ExecutionContext* context)
-{
-    SecurityOrigin* origin = context->getSecurityOrigin();
-    ASSERT(origin);
-
-    return notificationManager()->checkPermission(WebSecurityOrigin(origin));
+    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.
     ASSERT(context->activeDOMObjectsAreStopped());
@@ skipping 35 matching lines @@
 
 DEFINE_TRACE(Notification)
 {
     visitor->trace(m_prepareShowMethodRunner);
     visitor->trace(m_loader);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink