Handle multiple feature requests

This patch makes it possible to have multiple outstanding feature
requests and adds hooks for chromium to cancel requests.

Change-Id: Icbeb30aa39ace090d853a29aefaeebbe726fe251
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 324a191fb..cb006106e 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -92,16 +92,14 @@ public:
 
     void overrideWebPreferences(content::WebContents *, content::WebPreferences*);
     void allowCertificateError(const QSharedPointer<CertificateErrorController> &) ;
-    void requestGeolocationPermission(const GURL &requestingFrameOrigin, base::Callback<void (bool)> resultCallback);
+    void requestGeolocationPermission(const GURL &requestingFrameOrigin, const base::Callback<void (bool)> &resultCallback);
+    void cancelGeolocationPermissionRequest(const GURL &requestingFrameOrigin);
     void geolocationPermissionReply(const QUrl&,  bool permission);
 
 private:
     WebContentsAdapter *createWindow(content::WebContents *new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture);
 
-    struct {
-        QUrl url;
-        base::Callback<void (bool)> callback;
-    } m_lastGeolocationPermissionRequest;
+    QHash<QUrl, base::Callback<void (bool)> > m_geolocationPermissionRequests;
 
     WebContentsAdapterClient *m_viewClient;
     QString m_lastSearchedString;