Basic porting to Chromium 51

Trivial changes in methods, arguments and types.

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

1 files changed, 5 insertions, 7 deletions

diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h
index ff35357d8..e4392b01c 100644
--- a/src/core/permission_manager_qt.h
+++ b/src/core/permission_manager_qt.h
@@ -64,12 +64,11 @@ public:
         content::PermissionType permission,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
-        bool user_gesture,
-        const base::Callback<void(content::PermissionStatus)>& callback) override;
+        const base::Callback<void(blink::mojom::PermissionStatus)>& callback) override;
 
     void CancelPermissionRequest(int request_id) override;
 
-    content::PermissionStatus GetPermissionStatus(
+    blink::mojom::PermissionStatus GetPermissionStatus(
         content::PermissionType permission,
         const GURL& requesting_origin,
         const GURL& embedding_origin) override;
@@ -83,9 +82,8 @@ public:
         const std::vector<content::PermissionType>& permission,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
-        bool user_gesture,
         const base::Callback<void(
-            const std::vector<content::PermissionStatus>&)>& callback) override;
+            const std::vector<blink::mojom::PermissionStatus>&)>& callback) override;
 
     void RegisterPermissionUsage(
         content::PermissionType permission,
@@ -96,7 +94,7 @@ public:
         content::PermissionType permission,
         const GURL& requesting_origin,
         const GURL& embedding_origin,
-        const base::Callback<void(content::PermissionStatus)>& callback) override;
+        const base::Callback<void(blink::mojom::PermissionStatus)>& callback) override;
 
     void UnsubscribePermissionStatusChange(int subscription_id) override;
 
@@ -105,7 +103,7 @@ private:
     struct RequestOrSubscription {
         PermissionType type;
         QUrl origin;
-        base::Callback<void(content::PermissionStatus)> callback;
+        base::Callback<void(blink::mojom::PermissionStatus)> callback;
     };
     QHash<int, RequestOrSubscription> m_requests;
     QHash<int, RequestOrSubscription> m_subscribers;