Permission Management for Chromium 44

Implementing the new PermissionManager API.

Change-Id: If0fdac24b8fec561a898aba009345576b5ce7fc6
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index d51ff8c3a..e2a6a2cbd 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -39,6 +39,7 @@
 
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/permission_status.mojom.h"
 
 #include "base/callback.h"
 
@@ -101,15 +102,11 @@ public:
 
     void overrideWebPreferences(content::WebContents *, content::WebPreferences*);
     void allowCertificateError(const QSharedPointer<CertificateErrorController> &) ;
-    void requestGeolocationPermission(const GURL &requestingFrameOrigin, const base::Callback<void (bool)> &resultCallback);
-    void cancelGeolocationPermissionRequest(const GURL &requestingFrameOrigin);
-    void geolocationPermissionReply(const QUrl&,  bool permission);
+    void requestGeolocationPermission(const QUrl &requestingOrigin);
 
 private:
     WebContentsAdapter *createWindow(content::WebContents *new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture);
 
-    QHash<QUrl, base::Callback<void (bool)> > m_geolocationPermissionRequests;
-
     WebContentsAdapterClient *m_viewClient;
     QString m_lastSearchedString;
     int m_lastReceivedFindReply;