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

Unified Diff: third_party/WebKit/Source/modules/permissions/Permissions.cpp

Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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: third_party/WebKit/Source/modules/permissions/Permissions.cpp
diff --git a/third_party/WebKit/Source/modules/permissions/Permissions.cpp b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
index 11929960cdd166a77468c5e4ed8d9053c0b2f76d..69d0caeeb51ec8ccec11f44974a56555d86f9d82 100644
--- a/third_party/WebKit/Source/modules/permissions/Permissions.cpp
+++ b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
@@ -19,8 +19,8 @@
#include "modules/permissions/PermissionStatus.h"
#include "platform/Logging.h"
#include "platform/UserGestureIndicator.h"
+#include "public/platform/InterfaceProvider.h"
#include "public/platform/Platform.h"
-#include "public/platform/ServiceRegistry.h"
#include "wtf/Functional.h"
#include "wtf/NotFound.h"
#include "wtf/PtrUtil.h"
@@ -100,18 +100,18 @@ Nullable<PermissionName> parsePermission(ScriptState* scriptState, const Diction
// static
bool Permissions::connectToService(ExecutionContext* executionContext, mojom::blink::PermissionServiceRequest request)
{
- ServiceRegistry* serviceRegistry = nullptr;
+ InterfaceProvider* interfaceProvider = nullptr;
if (executionContext->isDocument()) {
Document* document = toDocument(executionContext);
if (document->frame())
- serviceRegistry = document->frame()->serviceRegistry();
+ interfaceProvider = document->frame()->interfaceProvider();
} else {
- serviceRegistry = Platform::current()->serviceRegistry();
+ interfaceProvider = Platform::current()->interfaceProvider();
}
- if (serviceRegistry)
- serviceRegistry->connectToRemoteService(std::move(request));
- return serviceRegistry;
+ if (interfaceProvider)
+ interfaceProvider->getInterface(std::move(request));
+ return interfaceProvider;
}
ScriptPromise Permissions::query(ScriptState* scriptState, const Dictionary& rawPermission)

Powered by Google App Engine
This is Rietveld 408576698