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

Unified Diff: content/child/blink_platform_impl.cc

Issue 2460723003: Enable connection to Mojo services from Blink (Closed)
Patch Set: Rebase Created 4 years 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/blink_platform_impl.h ('k') | content/public/app/mojo/content_renderer_manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index a87fcd54a0f1f9ca30c67992a9f3556d78acfc13..4f3c2aae6317f49dbb5286c94f946e74bc462ab3 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -48,7 +48,10 @@
#include "content/child/web_url_request_util.h"
#include "content/child/worker_thread_registry.h"
#include "content/public/common/content_client.h"
+#include "content/public/common/service_manager_connection.h"
#include "net/base/net_errors.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
@@ -71,11 +74,6 @@ using blink::scheduler::WebThreadImplForWorkerScheduler;
namespace content {
-namespace {
-
-
-} // namespace
-
static int ToMessageID(WebLocalizedString::Name name) {
switch (name) {
case WebLocalizedString::AXAMPMFieldText:
@@ -786,6 +784,19 @@ bool BlinkPlatformImpl::databaseSetFileSize(
return false;
}
+void BlinkPlatformImpl::bindServiceConnector(
+ mojo::ScopedMessagePipeHandle remote_handle) {
+ if (!ChildThreadImpl::current())
+ return;
+
+ service_manager::mojom::ConnectorRequest chromium_request;
+ chromium_request.Bind(std::move(remote_handle));
+ ChildThreadImpl::current()
+ ->GetServiceManagerConnection()
+ ->GetConnector()
+ ->BindRequest(std::move(chromium_request));
+}
+
size_t BlinkPlatformImpl::actualMemoryUsageMB() {
return GetMemoryUsageKB() >> 10;
}
« no previous file with comments | « content/child/blink_platform_impl.h ('k') | content/public/app/mojo/content_renderer_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698