| Index: content/public/browser/permission_manager.h
|
| diff --git a/content/public/browser/permission_manager.h b/content/public/browser/permission_manager.h
|
| index 0108b66d5e4d604c67d8b92c26d4d46e22153167..77bed7a606426797fee015b0f67a197376067d30 100644
|
| --- a/content/public/browser/permission_manager.h
|
| +++ b/content/public/browser/permission_manager.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef CONTENT_PUBLIC_BROWSER_PERMISSION_MANAGER_H_
|
| #define CONTENT_PUBLIC_BROWSER_PERMISSION_MANAGER_H_
|
|
|
| +#include "components/permission/public/interfaces/permission_status.mojom.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/public/common/permission_status.mojom.h"
|
|
|
| class GURL;
|
|
|
| @@ -38,7 +38,7 @@ class CONTENT_EXPORT PermissionManager {
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| - const base::Callback<void(PermissionStatus)>& callback) = 0;
|
| + const base::Callback<void(permission::Status)>& callback) = 0;
|
|
|
| // Cancels a previous permission request specified by |request_id|. Cancelling
|
| // an already cancelled request or providing the |request_id|
|
| @@ -48,7 +48,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 PermissionStatus GetPermissionStatus(
|
| + virtual permission::Status GetPermissionStatus(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) = 0;
|
| @@ -73,7 +73,7 @@ class CONTENT_EXPORT PermissionManager {
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(PermissionStatus)>& callback) = 0;
|
| + const base::Callback<void(permission::Status)>& callback) = 0;
|
|
|
| // Unregisters from permission status change notifications.
|
| // The |subscription_id| must match the value returned by the
|
|
|