| Index: chrome/browser/permissions/permission_manager.h
|
| diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
|
| index 3e7731470164cbfdbdcd45253a8b23a9ae4b4517..351cd589e5d99287ed49d9d7ba70f2b7c8b3c605 100644
|
| --- a/chrome/browser/permissions/permission_manager.h
|
| +++ b/chrome/browser/permissions/permission_manager.h
|
| @@ -38,20 +38,20 @@ class PermissionManager : public KeyedService,
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| - override;
|
| + const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| + callback) override;
|
| int RequestPermissions(
|
| const std::vector<content::PermissionType>& permissions,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<
|
| - void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
|
| + const base::Callback<void(
|
| + const std::vector<permissions::mojom::PermissionStatus>&)>& callback)
|
| override;
|
| void CancelPermissionRequest(int request_id) override;
|
| void ResetPermission(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| - blink::mojom::PermissionStatus GetPermissionStatus(
|
| + permissions::mojom::PermissionStatus GetPermissionStatus(
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| @@ -62,8 +62,8 @@ class PermissionManager : public KeyedService,
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| - override;
|
| + const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| + callback) override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override;
|
|
|
| private:
|
| @@ -93,7 +93,7 @@ class PermissionManager : public KeyedService,
|
| void OnPermissionsRequestResponseStatus(
|
| int request_id,
|
| int permission_id,
|
| - blink::mojom::PermissionStatus status);
|
| + permissions::mojom::PermissionStatus status);
|
|
|
| // content_settings::Observer implementation.
|
| void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
|
|
|