Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(996)

Unified Diff: blimp/engine/app/blimp_permission_manager.h

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/aw_permission_manager.cc ('k') | blimp/engine/app/blimp_permission_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/engine/app/blimp_permission_manager.h
diff --git a/blimp/engine/app/blimp_permission_manager.h b/blimp/engine/app/blimp_permission_manager.h
index 3af16482340e5e20bba4d38cc27f55b80ea4218b..7b09262abd9c957c00659bc2fbd2e3bdf1f6c98b 100644
--- a/blimp/engine/app/blimp_permission_manager.h
+++ b/blimp/engine/app/blimp_permission_manager.h
@@ -24,20 +24,20 @@
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(permissions::mojom::PermissionStatus)>&
- callback) override;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+ override;
int RequestPermissions(
const std::vector<content::PermissionType>& permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(
- const std::vector<permissions::mojom::PermissionStatus>&)>& callback)
+ const base::Callback<
+ void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
override;
void CancelPermissionRequest(int request_id) override;
void ResetPermission(content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
- permissions::mojom::PermissionStatus GetPermissionStatus(
+ blink::mojom::PermissionStatus GetPermissionStatus(
content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
@@ -48,8 +48,8 @@
content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
- const base::Callback<void(permissions::mojom::PermissionStatus)>&
- callback) override;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+ override;
void UnsubscribePermissionStatusChange(int subscription_id) override;
private:
« no previous file with comments | « android_webview/browser/aw_permission_manager.cc ('k') | blimp/engine/app/blimp_permission_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698