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

Unified Diff: content/browser/permissions/permission_service_impl.h

Issue 1726323002: Have Permission{Manager,Service} use Origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clarify and test Origin.empty_. Created 4 years, 10 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/browser/permissions/permission_service_impl.h
diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h
index 098a9e3664c5ff113a4732a22b4484c4a09e0848..f44a34663a3fd96a7da52e2f637d6a44ba81dbb7 100644
--- a/content/browser/permissions/permission_service_impl.h
+++ b/content/browser/permissions/permission_service_impl.h
@@ -11,6 +11,7 @@
#include "content/browser/permissions/permission_service_context.h"
#include "content/common/permission_service.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
+#include "url/origin.h"
namespace content {
@@ -56,14 +57,15 @@ class PermissionServiceImpl : public PermissionService {
using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
struct PendingSubscription {
- PendingSubscription(PermissionType permission, const GURL& origin,
+ PendingSubscription(PermissionType permission,
+ const url::Origin& origin,
const PermissionStatusCallback& callback);
~PendingSubscription();
// Subscription ID received from the PermissionManager.
int id;
PermissionType permission;
- GURL origin;
+ url::Origin origin;
PermissionStatusCallback callback;
};
using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>;
@@ -97,10 +99,10 @@ class PermissionServiceImpl : public PermissionService {
const std::vector<PermissionStatus>& result);
PermissionStatus GetPermissionStatusFromName(PermissionName permission,
- const GURL& origin);
+ const url::Origin& origin);
PermissionStatus GetPermissionStatusFromType(PermissionType type,
- const GURL& origin);
- void ResetPermissionStatus(PermissionType type, const GURL& origin);
+ const url::Origin& origin);
+ void ResetPermissionStatus(PermissionType type, const url::Origin& origin);
void OnPermissionStatusChanged(int pending_subscription_id,
PermissionStatus status);

Powered by Google App Engine
This is Rietveld 408576698