From 442ad85ee3f40a981fa721673dd6c7344d1daece Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Wed, 30 Sep 2015 13:59:22 +0200
Subject: Remove unnecessay delegation over CustomUrlSchemeHandler

With QWebEngineSchemeHandler in QtWebEngineCore, we do not need the
indirection and delegation CustomUrlSchemeHandler provided. This
means the class can be removed and we can also store the handlers
directly in BrowserContextAdapter and save a copy of the installed
handlers in the QWebEngineProfile.

Change-Id: Iabb5cc9d364c2f2a879bc77bfb2ff14b3c2ff640
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/core/browser_context_adapter.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/core/browser_context_adapter.h')

diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h
index 0bca1bf8b..5272268f7 100644
--- a/src/core/browser_context_adapter.h
+++ b/src/core/browser_context_adapter.h
@@ -48,6 +48,7 @@
 
 #include "api/qwebenginecookiestoreclient.h"
 #include "api/qwebengineurlrequestinterceptor.h"
+#include "api/qwebengineurlschemehandler.h"
 
 QT_FORWARD_DECLARE_CLASS(QObject)
 
@@ -55,7 +56,6 @@ namespace QtWebEngineCore {
 
 class BrowserContextAdapterClient;
 class BrowserContextQt;
-class CustomUrlSchemeHandler;
 class DownloadManagerDelegateQt;
 class UserScriptControllerHost;
 class WebEngineVisitedLinksManager;
@@ -145,9 +145,9 @@ public:
     bool trackVisitedLinks() const;
     bool persistVisitedLinks() const;
 
-    QVector<CustomUrlSchemeHandler*> &customUrlSchemeHandlers();
+    QHash<QByteArray, QWebEngineUrlSchemeHandler *> &customUrlSchemeHandlers();
     void updateCustomUrlSchemeHandlers();
-    void removeCustomUrlSchemeHandler(CustomUrlSchemeHandler*);
+    void removeCustomUrlSchemeHandler(QWebEngineUrlSchemeHandler *);
     UserScriptControllerHost *userScriptController();
 
     void permissionRequestReply(const QUrl &origin, PermissionType type, bool reply);
@@ -173,7 +173,7 @@ private:
     QString m_httpAcceptLanguage;
     PersistentCookiesPolicy m_persistentCookiesPolicy;
     VisitedLinksPolicy m_visitedLinksPolicy;
-    QVector<CustomUrlSchemeHandler*> m_customUrlSchemeHandlers;
+    QHash<QByteArray, QWebEngineUrlSchemeHandler *> m_customUrlSchemeHandlers;
     QList<BrowserContextAdapterClient*> m_clients;
     int m_httpCacheMaxSize;
 
-- 
cgit v1.2.3