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

Unified Diff: content/child/permissions/permission_dispatcher.cc

Issue 2079943002: Change RenderFrame to use InterfaceRegistry et al. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a2
Patch Set: . 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/permissions/permission_dispatcher.h ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/permissions/permission_dispatcher.cc
diff --git a/content/child/permissions/permission_dispatcher.cc b/content/child/permissions/permission_dispatcher.cc
index b2dea9a3f687569652173785c49c823d0baf7427..c643649e3e210f6a9938c402639d3d2a6370b8ea 100644
--- a/content/child/permissions/permission_dispatcher.cc
+++ b/content/child/permissions/permission_dispatcher.cc
@@ -7,9 +7,10 @@
#include <stddef.h>
#include <utility>
+#include "base/bind.h"
#include "base/callback.h"
#include "content/public/child/worker_thread.h"
-#include "content/public/common/service_registry.h"
+#include "services/shell/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/modules/permissions/WebPermissionObserver.h"
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
@@ -88,8 +89,9 @@ bool PermissionDispatcher::IsObservable(blink::WebPermissionType type) {
type == blink::WebPermissionTypeBackgroundSync;
}
-PermissionDispatcher::PermissionDispatcher(ServiceRegistry* service_registry)
- : service_registry_(service_registry) {
+PermissionDispatcher::PermissionDispatcher(
+ shell::InterfaceProvider* remote_interfaces)
+ : remote_interfaces_(remote_interfaces) {
}
PermissionDispatcher::~PermissionDispatcher() {
@@ -230,8 +232,7 @@ void PermissionDispatcher::RunPermissionsCallbackOnWorkerThread(
blink::mojom::PermissionService*
PermissionDispatcher::GetPermissionServicePtr() {
if (!permission_service_.get()) {
- service_registry_->ConnectToRemoteService(
- mojo::GetProxy(&permission_service_));
+ remote_interfaces_->GetInterface(mojo::GetProxy(&permission_service_));
}
return permission_service_.get();
}
« no previous file with comments | « content/child/permissions/permission_dispatcher.h ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698