| Index: chrome/browser/permissions/permission_manager.h
|
| diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
|
| index 118bd3f91f67b78d382ede87a215cd3bfc263fef..6850187649dedcb4ac9f392d785712cf1e0273b4 100644
|
| --- a/chrome/browser/permissions/permission_manager.h
|
| +++ b/chrome/browser/permissions/permission_manager.h
|
| @@ -35,15 +35,14 @@ class PermissionManager : public KeyedService,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) override;
|
| + const base::Callback<void(permission::Status)>& callback) override;
|
| void CancelPermissionRequest(int request_id) override;
|
| void ResetPermission(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| - content::PermissionStatus GetPermissionStatus(
|
| - content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) override;
|
| + permission::Status GetPermissionStatus(content::PermissionType permission,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin) override;
|
| void RegisterPermissionUsage(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| @@ -51,7 +50,7 @@ class PermissionManager : public KeyedService,
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) override;
|
| + const base::Callback<void(permission::Status)>& callback) override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override;
|
|
|
| private:
|
| @@ -63,7 +62,7 @@ class PermissionManager : public KeyedService,
|
|
|
| void OnPermissionRequestResponse(
|
| int request_id,
|
| - const base::Callback<void(content::PermissionStatus)>& callback,
|
| + const base::Callback<void(permission::Status)>& callback,
|
| ContentSetting content_setting);
|
|
|
| // Not all WebContents are able to display permission requests. If the PBM
|
|
|