Index: content/browser/permissions/permission_service_context.h |
diff --git a/content/browser/permissions/permission_service_context.h b/content/browser/permissions/permission_service_context.h |
index 87b75921f88e4a8848601d5098b1fcf37b87ee38..347808e5f8ef376b720b2f8d2a6e9f23e8d8c1b0 100644 |
--- a/content/browser/permissions/permission_service_context.h |
+++ b/content/browser/permissions/permission_service_context.h |
@@ -8,7 +8,7 @@ |
#include "base/macros.h" |
#include "content/public/browser/permission_type.h" |
#include "content/public/browser/web_contents_observer.h" |
-#include "mojo/public/cpp/bindings/interface_request.h" |
+#include "mojo/public/cpp/bindings/strong_binding_set.h" |
#include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h" |
namespace service_manager { |
@@ -21,7 +21,6 @@ class Origin; |
namespace content { |
-class PermissionServiceImpl; |
class RenderFrameHost; |
class RenderProcessHost; |
@@ -39,14 +38,9 @@ class PermissionServiceContext : public WebContentsObserver { |
void CreateService(const service_manager::BindSourceInfo& source_info, |
blink::mojom::PermissionServiceRequest request); |
- void CreateSubscription( |
- PermissionType permission_type, |
- const url::Origin& origin, |
- mojo::InterfacePtr<blink::mojom::PermissionObserver> observer); |
- |
- // Called by a PermissionServiceImpl identified as |service| when it has a |
- // connection error in order to get unregistered and killed. |
- void ServiceHadConnectionError(PermissionServiceImpl* service); |
+ void CreateSubscription(PermissionType permission_type, |
+ const url::Origin& origin, |
+ blink::mojom::PermissionObserverPtr observer); |
// Called when the connection to a PermissionObserver has an error. |
void ObserverHadConnectionError(int subscription_id); |
@@ -65,11 +59,11 @@ class PermissionServiceContext : public WebContentsObserver { |
void FrameDeleted(RenderFrameHost* render_frame_host) override; |
void DidFinishNavigation(NavigationHandle* navigation_handle) override; |
- void CancelPendingOperations(RenderFrameHost*); |
+ void CloseBindings(RenderFrameHost*); |
RenderFrameHost* render_frame_host_; |
RenderProcessHost* render_process_host_; |
- std::vector<std::unique_ptr<PermissionServiceImpl>> services_; |
+ mojo::StrongBindingSet<blink::mojom::PermissionService> services_; |
std::unordered_map<int, std::unique_ptr<PermissionSubscription>> |
subscriptions_; |