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

Unified Diff: content/public/browser/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 | « content/public/browser/BUILD.gn ('k') | content/public/browser/platform_notification_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/permission_manager.h
diff --git a/content/public/browser/permission_manager.h b/content/public/browser/permission_manager.h
index c8459520218eaf7c5ab2ecae52f38a7b286a22f2..c783c33a63e622e35aeecc438500141f90601049 100644
--- a/content/public/browser/permission_manager.h
+++ b/content/public/browser/permission_manager.h
@@ -5,8 +5,8 @@
#ifndef CONTENT_PUBLIC_BROWSER_PERMISSION_MANAGER_H_
#define CONTENT_PUBLIC_BROWSER_PERMISSION_MANAGER_H_
-#include "components/permissions/permission_status.mojom.h"
#include "content/common/content_export.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
class GURL;
@@ -37,8 +37,7 @@
PermissionType permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(permissions::mojom::PermissionStatus)>&
- callback) = 0;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback) = 0;
// Requests multiple permissions on behalf of a frame identified by
// render_frame_host.
@@ -54,9 +53,8 @@
const std::vector<PermissionType>& permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<
- void(const std::vector<permissions::mojom::PermissionStatus>&)>&
- callback) = 0;
+ const base::Callback<void(
+ const std::vector<blink::mojom::PermissionStatus>&)>& callback) = 0;
// Cancels a previous permission request specified by |request_id|. Cancelling
// an already cancelled request or providing the |request_id|
@@ -66,7 +64,7 @@
// Returns the permission status of a given requesting_origin/embedding_origin
// tuple. This is not taking a RenderFrameHost because the call might happen
// outside of a frame context.
- virtual permissions::mojom::PermissionStatus GetPermissionStatus(
+ virtual blink::mojom::PermissionStatus GetPermissionStatus(
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) = 0;
@@ -91,8 +89,7 @@
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
- const base::Callback<void(permissions::mojom::PermissionStatus)>&
- callback) = 0;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback) = 0;
// Unregisters from permission status change notifications.
// The |subscription_id| must match the value returned by the
« no previous file with comments | « content/public/browser/BUILD.gn ('k') | content/public/browser/platform_notification_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698