Convert Callbacks to OnceCallbacks in permissions APIs.
These callbacks are only called once, so change them to the correct
spelling. This allows callbacks in content/shell/ to be converted.
[email protected], [email protected], [email protected], [email protected]
TBR=skyostil
Bug: 953861
Change-Id: I5ca14e8bbf973658b3df8b650f6f4d51797e362f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1592356
Reviewed-by: danakj <[email protected]>
Reviewed-by: Luke Halliwell <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Reviewed-by: Peter Beverloo <[email protected]>
Reviewed-by: Balazs Engedy <[email protected]>
Commit-Queue: danakj <[email protected]>
Cr-Commit-Position: refs/heads/master@{#656049}
diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
index f907ae4f1..39ab8575 100644
--- a/chrome/browser/permissions/permission_manager.h
+++ b/chrome/browser/permissions/permission_manager.h
@@ -53,13 +53,13 @@
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
- const base::Callback<void(ContentSetting)>& callback);
+ base::OnceCallback<void(ContentSetting)> callback);
int RequestPermissions(
const std::vector<ContentSettingsType>& permissions,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
- const base::Callback<void(const std::vector<ContentSetting>&)>& callback);
+ base::OnceCallback<void(const std::vector<ContentSetting>&)> callback);
PermissionResult GetPermissionStatus(ContentSettingsType permission,
const GURL& requesting_origin,
@@ -77,20 +77,19 @@
const GURL& requesting_origin);
// content::PermissionControllerDelegate implementation.
- int RequestPermission(
- content::PermissionType permission,
- content::RenderFrameHost* render_frame_host,
- const GURL& requesting_origin,
- bool user_gesture,
- const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
- override;
+ int RequestPermission(content::PermissionType permission,
+ content::RenderFrameHost* render_frame_host,
+ const GURL& requesting_origin,
+ bool user_gesture,
+ base::OnceCallback<void(blink::mojom::PermissionStatus)>
+ callback) override;
int RequestPermissions(
const std::vector<content::PermissionType>& permissions,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
- const base::Callback<
- void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
+ base::OnceCallback<
+ void(const std::vector<blink::mojom::PermissionStatus>&)> callback)
override;
void ResetPermission(content::PermissionType permission,
const GURL& requesting_origin,
@@ -107,7 +106,7 @@
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+ base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
override;
void UnsubscribePermissionStatusChange(int subscription_id) override;
