Remove support for legacy WebKit Notifications

Source/web/NotificationPresenterImpl.cpp

 /*
  * Copyright (C) 2009 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "NotificationPresenterImpl.h"
 
 #include "WebNotification.h"
 #include "WebNotificationPermissionCallback.h"
 #include "WebNotificationPresenter.h"
 #include "core/dom/ExecutionContext.h"
-#include "modules/notifications/NotificationBase.h"
+#include "modules/notifications/Notification.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 using namespace WebCore;
 
 namespace blink {
 
-#if ENABLE(LEGACY_NOTIFICATIONS)
-class VoidCallbackClient : public WebNotificationPermissionCallback {
-public:
-    explicit VoidCallbackClient(PassOwnPtr<VoidCallback> callback)
-        : m_callback(callback)
-    {
-    }
-
-    virtual void permissionRequestComplete()
-    {
-        if (m_callback)
-            m_callback->handleEvent();
-        delete this;
-    }
-
-private:
-    virtual ~VoidCallbackClient() { }
-
-    OwnPtr<VoidCallback> m_callback;
-};
-#endif // ENABLE(LEGACY_NOTIFICATIONS)
-
 class NotificationPermissionCallbackClient : public WebNotificationPermissionCallback {
 public:
     NotificationPermissionCallbackClient(WebNotificationPresenter* presenter, PassRefPtr<SecurityOrigin> securityOrigin, PassOwnPtr<NotificationPermissionCallback> callback)
         : m_presenter(presenter)
         , m_securityOrigin(securityOrigin)
         , m_callback(callback)
     {
     }
 
     virtual void permissionRequestComplete()
     {
         if (m_callback)
-            m_callback->handleEvent(NotificationBase::permissionString(static_cast<NotificationClient::Permission>(m_presenter->checkPermission(WebSecurityOrigin(m_securityOrigin)))));
+            m_callback->handleEvent(Notification::permissionString(static_cast<NotificationClient::Permission>(m_presenter->checkPermission(WebSecurityOrigin(m_securityOrigin)))));
         delete this;
     }
 
 private:
     virtual ~NotificationPermissionCallbackClient() { }
 
     WebNotificationPresenter* m_presenter;
     RefPtr<SecurityOrigin> m_securityOrigin;
     OwnPtr<NotificationPermissionCallback> m_callback;
 };
 
 void NotificationPresenterImpl::initialize(WebNotificationPresenter* presenter)
 {
     m_presenter = presenter;
 }
 
 bool NotificationPresenterImpl::isInitialized()
 {
     return !!m_presenter;
 }
 
-bool NotificationPresenterImpl::show(NotificationBase* notification)
+bool NotificationPresenterImpl::show(Notification* notification)
 {
-    return m_presenter->show(PassRefPtr<NotificationBase>(notification));
+    return m_presenter->show(PassRefPtr<Notification>(notification));
 }
 
-void NotificationPresenterImpl::cancel(NotificationBase* notification)
+void NotificationPresenterImpl::cancel(Notification* notification)
 {
-    m_presenter->cancel(PassRefPtr<NotificationBase>(notification));
+    m_presenter->cancel(PassRefPtr<Notification>(notification));
 }
 
-void NotificationPresenterImpl::notificationObjectDestroyed(NotificationBase* notification)
+void NotificationPresenterImpl::notificationObjectDestroyed(Notification* notification)
 {
-    m_presenter->objectDestroyed(PassRefPtr<NotificationBase>(notification));
+    m_presenter->objectDestroyed(PassRefPtr<Notification>(notification));
 }
 
 NotificationClient::Permission NotificationPresenterImpl::checkPermission(ExecutionContext* context)
 {
     int result = m_presenter->checkPermission(WebSecurityOrigin(context->securityOrigin()));
     return static_cast<NotificationClient::Permission>(result);
 }
 
-#if ENABLE(LEGACY_NOTIFICATIONS)
-void NotificationPresenterImpl::requestPermission(ExecutionContext* context, PassOwnPtr<VoidCallback> callback)
-{
-    m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new VoidCallbackClient(callback));
-}
-#endif // ENABLE(LEGACY_NOTIFICATIONS)
-
 void NotificationPresenterImpl::requestPermission(ExecutionContext* context, WTF::PassOwnPtr<NotificationPermissionCallback> callback)
 {
     m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new NotificationPermissionCallbackClient(m_presenter, context->securityOrigin(), callback));
 }
 
 } // namespace blink