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

Side by Side Diff: content/renderer/mojo/service_registry_js_wrapper.cc

Issue 1470153002: [mojo] Enable ServiceRegistryImpl to override remote services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing-3
Patch Set: rebase Created 4 years, 11 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 #include "content/renderer/mojo/service_registry_js_wrapper.h" 5 #include "content/renderer/mojo/service_registry_js_wrapper.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/scoped_ptr.h"
9 #include "content/common/mojo/service_registry_impl.h" 10 #include "content/common/mojo/service_registry_impl.h"
10 #include "content/public/common/service_registry.h" 11 #include "content/public/common/service_registry.h"
11 #include "third_party/mojo/src/mojo/edk/js/handle.h" 12 #include "third_party/mojo/src/mojo/edk/js/handle.h"
13 #include "v8/include/v8.h"
12 14
13 namespace content { 15 namespace content {
14 16
17 namespace {
18
19 void CallJsFactory(scoped_ptr<v8::Persistent<v8::Function>> factory,
20 mojo::ScopedMessagePipeHandle pipe) {
21 v8::Isolate* isolate = v8::Isolate::GetCurrent();
22 v8::Local<v8::Value> argv[] = {
23 gin::ConvertToV8(isolate, mojo::Handle(pipe.release().value()))
24 };
25 factory->Get(isolate)->Call(v8::Undefined(isolate), 1, argv);
26 }
27
28 } // namespace
29
15 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = { 30 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = {
16 gin::kEmbedderNativeGin}; 31 gin::kEmbedderNativeGin};
17 const char ServiceRegistryJsWrapper::kModuleName[] = 32 const char ServiceRegistryJsWrapper::kModuleName[] =
18 "content/public/renderer/service_provider"; 33 "content/public/renderer/service_provider";
19 34
20 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() { 35 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() {
21 } 36 }
22 37
23 // static 38 // static
24 gin::Handle<ServiceRegistryJsWrapper> ServiceRegistryJsWrapper::Create( 39 gin::Handle<ServiceRegistryJsWrapper> ServiceRegistryJsWrapper::Create(
25 v8::Isolate* isolate, 40 v8::Isolate* isolate,
26 ServiceRegistry* service_registry) { 41 ServiceRegistry* service_registry) {
27 return gin::CreateHandle( 42 return gin::CreateHandle(
28 isolate, 43 isolate,
29 new ServiceRegistryJsWrapper( 44 new ServiceRegistryJsWrapper(
30 static_cast<ServiceRegistryImpl*>(service_registry)->GetWeakPtr())); 45 static_cast<ServiceRegistryImpl*>(service_registry)->GetWeakPtr()));
31 } 46 }
32 47
33 gin::ObjectTemplateBuilder ServiceRegistryJsWrapper::GetObjectTemplateBuilder( 48 gin::ObjectTemplateBuilder ServiceRegistryJsWrapper::GetObjectTemplateBuilder(
34 v8::Isolate* isolate) { 49 v8::Isolate* isolate) {
35 return Wrappable<ServiceRegistryJsWrapper>::GetObjectTemplateBuilder(isolate). 50 return Wrappable<ServiceRegistryJsWrapper>::GetObjectTemplateBuilder(isolate).
36 SetMethod("connectToService", 51 SetMethod("connectToService",
37 &ServiceRegistryJsWrapper::ConnectToService); 52 &ServiceRegistryJsWrapper::ConnectToService).
53 SetMethod("addServiceOverride",
54 &ServiceRegistryJsWrapper::AddServiceOverride);
38 } 55 }
39 56
40 mojo::Handle ServiceRegistryJsWrapper::ConnectToService( 57 mojo::Handle ServiceRegistryJsWrapper::ConnectToService(
41 const std::string& service_name) { 58 const std::string& service_name) {
42 mojo::MessagePipe pipe; 59 mojo::MessagePipe pipe;
43 if (service_registry_) 60 if (service_registry_)
44 service_registry_->ConnectToRemoteService(service_name, 61 service_registry_->ConnectToRemoteService(service_name,
45 std::move(pipe.handle0)); 62 std::move(pipe.handle0));
46 return pipe.handle1.release(); 63 return pipe.handle1.release();
47 } 64 }
48 65
66 void ServiceRegistryJsWrapper::AddServiceOverride(
67 const std::string& service_name,
68 v8::Local<v8::Function> service_factory) {
69 ServiceRegistryImpl* registry =
70 static_cast<ServiceRegistryImpl*>(service_registry_.get());
71 if (!registry)
72 return;
73 scoped_ptr<v8::Persistent<v8::Function>> factory(
74 new v8::Persistent<v8::Function>(v8::Isolate::GetCurrent(),
75 service_factory));
76 registry->AddServiceOverride(
77 service_name, base::Bind(&CallJsFactory, base::Passed(&factory)));
78 }
79
49 ServiceRegistryJsWrapper::ServiceRegistryJsWrapper( 80 ServiceRegistryJsWrapper::ServiceRegistryJsWrapper(
50 base::WeakPtr<ServiceRegistry> service_registry) 81 base::WeakPtr<ServiceRegistry> service_registry)
51 : service_registry_(service_registry) { 82 : service_registry_(service_registry) {
52 } 83 }
53 84
54 } // namespace content 85 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698