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

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: rebase 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 4d9ef411416600606d978a9ef04ae36354dbdafb..07fae0698fe92f292279f4b03a46a5657f563709 100644
--- a/content/shell/browser/layout_test/layout_test_permission_manager.h
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.h
@@ -27,18 +27,20 @@ class LayoutTestPermissionManager : public PermissionManager {
PermissionType permission,
RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
- const base::Callback<void(mojom::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<mojom::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;
- mojom::PermissionStatus GetPermissionStatus(
+ blink::mojom::PermissionStatus GetPermissionStatus(
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
@@ -49,11 +51,12 @@ class LayoutTestPermissionManager : public PermissionManager {
PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin,
- const base::Callback<void(mojom::PermissionStatus)>& callback) override;
+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
+ override;
void UnsubscribePermissionStatusChange(int subscription_id) override;
void SetPermission(PermissionType permission,
- mojom::PermissionStatus status,
+ blink::mojom::PermissionStatus status,
const GURL& origin,
const GURL& embedding_origin);
void ResetPermissions();
@@ -81,11 +84,11 @@ class LayoutTestPermissionManager : public PermissionManager {
struct Subscription;
using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>;
using PermissionsMap = base::hash_map<PermissionDescription,
- mojom::PermissionStatus,
+ blink::mojom::PermissionStatus,
PermissionDescription::Hash>;
void OnPermissionChanged(const PermissionDescription& permission,
- mojom::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.

Powered by Google App Engine
This is Rietveld 408576698