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

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

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep permission service alive if embedder drops requests Created 5 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
« no previous file with comments | « build/module_args/mojo.gni ('k') | content/browser/permissions/permission_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 57f1bfd48b1fa166b0c40c4261c6ec844ab6a4cf..33d3321858e6c264560b75f3df7fc09d09a33f5d 100644
--- a/content/browser/permissions/permission_service_impl.h
+++ b/content/browser/permissions/permission_service_impl.h
@@ -36,9 +36,13 @@ class PermissionServiceImpl : public mojo::InterfaceImpl<PermissionService> {
private:
struct PendingRequest {
- PendingRequest(PermissionType permission, const GURL& origin);
+ PendingRequest(PermissionType permission, const GURL& origin,
+ const mojo::Callback<void(PermissionStatus)>& callback);
+ ~PendingRequest();
+
PermissionType permission;
GURL origin;
+ mojo::Callback<void(PermissionStatus)> callback;
};
typedef IDMap<PendingRequest, IDMapOwnPointer> RequestsMap;
@@ -60,10 +64,7 @@ class PermissionServiceImpl : public mojo::InterfaceImpl<PermissionService> {
// mojo::InterfaceImpl.
void OnConnectionError() override;
- void OnRequestPermissionResponse(
- const mojo::Callback<void(PermissionStatus)>& callback,
- int request_id,
- PermissionStatus status);
+ void OnRequestPermissionResponse(int request_id, PermissionStatus status);
PermissionStatus GetPermissionStatus(PermissionType type, GURL origin);
void ResetPermissionStatus(PermissionType type, GURL origin);
« no previous file with comments | « build/module_args/mojo.gni ('k') | content/browser/permissions/permission_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698