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

Side by Side Diff: content/browser/permissions/permission_service_impl.h

Issue 2080513002: Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
6 #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ 6 #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
7 7
8 #include "base/callback.h"
8 #include "base/id_map.h" 9 #include "base/id_map.h"
9 #include "base/macros.h" 10 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
11 #include "content/browser/permissions/permission_service_context.h" 12 #include "content/browser/permissions/permission_service_context.h"
12 #include "mojo/public/cpp/bindings/binding.h" 13 #include "mojo/public/cpp/bindings/binding.h"
13 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo m.h" 14 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo m.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 enum class PermissionType; 18 enum class PermissionType;
(...skipping 16 matching lines...) Expand all
34 35
35 protected: 36 protected:
36 friend PermissionServiceContext; 37 friend PermissionServiceContext;
37 38
38 PermissionServiceImpl( 39 PermissionServiceImpl(
39 PermissionServiceContext* context, 40 PermissionServiceContext* context,
40 mojo::InterfaceRequest<blink::mojom::PermissionService> request); 41 mojo::InterfaceRequest<blink::mojom::PermissionService> request);
41 42
42 private: 43 private:
43 using PermissionStatusCallback = 44 using PermissionStatusCallback =
44 mojo::Callback<void(blink::mojom::PermissionStatus)>; 45 base::Callback<void(blink::mojom::PermissionStatus)>;
45 using PermissionsStatusCallback =
46 mojo::Callback<void(mojo::Array<blink::mojom::PermissionStatus>)>;
47 46
48 struct PendingRequest { 47 struct PendingRequest {
49 PendingRequest(const PermissionsStatusCallback& callback, 48 PendingRequest(const RequestPermissionsCallback& callback,
50 int request_count); 49 int request_count);
51 ~PendingRequest(); 50 ~PendingRequest();
52 51
53 // Request ID received from the PermissionManager. 52 // Request ID received from the PermissionManager.
54 int id; 53 int id;
55 PermissionsStatusCallback callback; 54 RequestPermissionsCallback callback;
56 int request_count; 55 int request_count;
57 }; 56 };
58 using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>; 57 using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
59 58
60 struct PendingSubscription { 59 struct PendingSubscription {
61 PendingSubscription(PermissionType permission, const GURL& origin, 60 PendingSubscription(PermissionType permission, const GURL& origin,
62 const PermissionStatusCallback& callback); 61 const PermissionStatusCallback& callback);
63 ~PendingSubscription(); 62 ~PendingSubscription();
64 63
65 // Subscription ID received from the PermissionManager. 64 // Subscription ID received from the PermissionManager.
66 int id; 65 int id;
67 PermissionType permission; 66 PermissionType permission;
68 GURL origin; 67 GURL origin;
69 PermissionStatusCallback callback; 68 PermissionStatusCallback callback;
70 }; 69 };
71 using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>; 70 using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>;
72 71
73 // blink::mojom::PermissionService. 72 // blink::mojom::PermissionService.
74 void HasPermission(blink::mojom::PermissionName permission, 73 void HasPermission(blink::mojom::PermissionName permission,
75 const mojo::String& origin, 74 const mojo::String& origin,
76 const PermissionStatusCallback& callback) override; 75 const PermissionStatusCallback& callback) override;
77 void RequestPermission(blink::mojom::PermissionName permission, 76 void RequestPermission(blink::mojom::PermissionName permission,
78 const mojo::String& origin, 77 const mojo::String& origin,
79 bool user_gesture, 78 bool user_gesture,
80 const PermissionStatusCallback& callback) override; 79 const PermissionStatusCallback& callback) override;
81 void RequestPermissions(mojo::Array<blink::mojom::PermissionName> permissions, 80 void RequestPermissions(mojo::Array<blink::mojom::PermissionName> permissions,
82 const mojo::String& origin, 81 const mojo::String& origin,
83 bool user_gesture, 82 bool user_gesture,
84 const PermissionsStatusCallback& callback) override; 83 const RequestPermissionsCallback& callback) override;
85 void RevokePermission(blink::mojom::PermissionName permission, 84 void RevokePermission(blink::mojom::PermissionName permission,
86 const mojo::String& origin, 85 const mojo::String& origin,
87 const PermissionStatusCallback& callback) override; 86 const PermissionStatusCallback& callback) override;
88 void GetNextPermissionChange( 87 void GetNextPermissionChange(
89 blink::mojom::PermissionName permission, 88 blink::mojom::PermissionName permission,
90 const mojo::String& origin, 89 const mojo::String& origin,
91 blink::mojom::PermissionStatus last_known_status, 90 blink::mojom::PermissionStatus last_known_status,
92 const PermissionStatusCallback& callback) override; 91 const PermissionStatusCallback& callback) override;
93 92
94 void OnConnectionError(); 93 void OnConnectionError();
(...skipping 21 matching lines...) Expand all
116 PermissionServiceContext* context_; 115 PermissionServiceContext* context_;
117 mojo::Binding<blink::mojom::PermissionService> binding_; 116 mojo::Binding<blink::mojom::PermissionService> binding_;
118 base::WeakPtrFactory<PermissionServiceImpl> weak_factory_; 117 base::WeakPtrFactory<PermissionServiceImpl> weak_factory_;
119 118
120 DISALLOW_COPY_AND_ASSIGN(PermissionServiceImpl); 119 DISALLOW_COPY_AND_ASSIGN(PermissionServiceImpl);
121 }; 120 };
122 121
123 } // namespace content 122 } // namespace content
124 123
125 #endif // CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ 124 #endif // CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/media/capture/image_capture_impl.cc ('k') | content/browser/permissions/permission_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698