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

Unified Diff: content/shell/browser/layout_test/layout_test_permission_manager.h

Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: content/shell/browser/layout_test/layout_test_permission_manager.h
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.h b/content/shell/browser/layout_test/layout_test_permission_manager.h
index 2ea014f88d2338c22de5c3831112192b1731966a..835afd58797b7e3fb0f2e2e87327c6cd354f0751 100644
--- a/content/shell/browser/layout_test/layout_test_permission_manager.h
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.h
@@ -27,20 +27,23 @@ class LayoutTestPermissionManager : public PermissionManager {
PermissionType permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(PermissionStatus)>& callback) override;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+ override;
int RequestPermissions(
const std::vector<PermissionType>& permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(
- const std::vector<PermissionStatus>&)>& callback) override;
+ const base::Callback<
+ void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
+ override;
void CancelPermissionRequest(int request_id) override;
void ResetPermission(PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
- PermissionStatus GetPermissionStatus(PermissionType permission,
- const GURL& requesting_origin,
- const GURL& embedding_origin) override;
+ blink::mojom::PermissionStatus GetPermissionStatus(
+ PermissionType permission,
+ const GURL& requesting_origin,
+ const GURL& embedding_origin) override;
void RegisterPermissionUsage(PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
@@ -48,11 +51,12 @@ class LayoutTestPermissionManager : public PermissionManager {
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
- const base::Callback<void(PermissionStatus)>& callback) override;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+ override;
void UnsubscribePermissionStatusChange(int subscription_id) override;
void SetPermission(PermissionType permission,
- PermissionStatus status,
+ blink::mojom::PermissionStatus status,
const GURL& origin,
const GURL& embedding_origin);
void ResetPermissions();
@@ -80,18 +84,18 @@ class LayoutTestPermissionManager : public PermissionManager {
struct Subscription;
using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>;
using PermissionsMap = base::hash_map<PermissionDescription,
- PermissionStatus,
+ blink::mojom::PermissionStatus,
PermissionDescription::Hash>;
void OnPermissionChanged(const PermissionDescription& permission,
- PermissionStatus status);
+ blink::mojom::PermissionStatus status);
// Mutex for permissions access. Unfortunately, the permissions can be
// accessed from the IO thread because of Notifications' synchronous IPC.
base::Lock permissions_lock_;
// List of permissions currently known by the LayoutTestPermissionManager and
- // their associated |PermissionStatus|.
+ // their associated |blink::mojom::PermissionStatus|.
PermissionsMap permissions_;
// List of subscribers currently listening to permission changes.

Powered by Google App Engine
This is Rietveld 408576698