| Index: chrome/browser/permissions/permission_manager.h
|
| diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
|
| index 79438b9ee74957bda1dec7431ddc17486b7ab07a..9b0b2eaaea59cc713e25d1697cbadfb291fd69fe 100644
|
| --- a/chrome/browser/permissions/permission_manager.h
|
| +++ b/chrome/browser/permissions/permission_manager.h
|
| @@ -19,7 +19,11 @@ class Profile;
|
| namespace content {
|
| enum class PermissionType;
|
| class WebContents;
|
| -}; // namespace content
|
| +} // namespace content
|
| +
|
| +namespace url {
|
| +class Origin;
|
| +} // namespace url
|
|
|
| class PermissionManager : public KeyedService,
|
| public content::PermissionManager,
|
| @@ -32,29 +36,29 @@ class PermissionManager : public KeyedService,
|
| int RequestPermission(
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| - const GURL& requesting_origin,
|
| + const url::Origin& requesting_origin,
|
| const base::Callback<void(content::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<content::PermissionStatus>&)>& callback) override;
|
| + const url::Origin& requesting_origin,
|
| + const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
|
| + callback) override;
|
| void CancelPermissionRequest(int request_id) override;
|
| void ResetPermission(content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) override;
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) override;
|
| content::PermissionStatus GetPermissionStatus(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) override;
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) override;
|
| void RegisterPermissionUsage(content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) override;
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) override;
|
| int SubscribePermissionStatusChange(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin,
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin,
|
| const base::Callback<void(content::PermissionStatus)>& callback) override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override;
|
|
|
|
|