Index: content/public/browser/permission_manager.h |
diff --git a/content/public/browser/permission_manager.h b/content/public/browser/permission_manager.h |
index 9aa5e300be6aa9a6fa99bf85f2fb4c609d5916f0..c783c33a63e622e35aeecc438500141f90601049 100644 |
--- a/content/public/browser/permission_manager.h |
+++ b/content/public/browser/permission_manager.h |
@@ -6,7 +6,7 @@ |
#define CONTENT_PUBLIC_BROWSER_PERMISSION_MANAGER_H_ |
#include "content/common/content_export.h" |
-#include "content/public/common/permission_status.mojom.h" |
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h" |
class GURL; |
@@ -37,7 +37,7 @@ class CONTENT_EXPORT PermissionManager { |
PermissionType permission, |
RenderFrameHost* render_frame_host, |
const GURL& requesting_origin, |
- const base::Callback<void(mojom::PermissionStatus)>& callback) = 0; |
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback) = 0; |
// Requests multiple permissions on behalf of a frame identified by |
// render_frame_host. |
@@ -53,8 +53,8 @@ class CONTENT_EXPORT PermissionManager { |
const std::vector<PermissionType>& permission, |
RenderFrameHost* render_frame_host, |
const GURL& requesting_origin, |
- const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>& |
- callback) = 0; |
+ const base::Callback<void( |
+ const std::vector<blink::mojom::PermissionStatus>&)>& callback) = 0; |
// Cancels a previous permission request specified by |request_id|. Cancelling |
// an already cancelled request or providing the |request_id| |
@@ -64,7 +64,7 @@ class CONTENT_EXPORT PermissionManager { |
// Returns the permission status of a given requesting_origin/embedding_origin |
// tuple. This is not taking a RenderFrameHost because the call might happen |
// outside of a frame context. |
- virtual mojom::PermissionStatus GetPermissionStatus( |
+ virtual blink::mojom::PermissionStatus GetPermissionStatus( |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) = 0; |
@@ -89,7 +89,7 @@ class CONTENT_EXPORT PermissionManager { |
PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
- const base::Callback<void(mojom::PermissionStatus)>& callback) = 0; |
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback) = 0; |
// Unregisters from permission status change notifications. |
// The |subscription_id| must match the value returned by the |