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

Side by Side Diff: services/js/mojo_bridge_module.cc

Issue 703023004: Move the JS content handler et al from mojo/apps/js to mojo/services (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fixed DEPS gl build Created 6 years, 1 month 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
« no previous file with comments | « services/js/mojo_bridge_module.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "mojo/apps/js/mojo_bridge_module.h" 5 #include "services/js/mojo_bridge_module.h"
6 6
7 #include "gin/arguments.h" 7 #include "gin/arguments.h"
8 #include "gin/converter.h" 8 #include "gin/converter.h"
9 #include "gin/object_template_builder.h" 9 #include "gin/object_template_builder.h"
10 #include "gin/per_isolate_data.h" 10 #include "gin/per_isolate_data.h"
11 #include "mojo/apps/js/js_app.h"
12 #include "mojo/edk/js/handle.h" 11 #include "mojo/edk/js/handle.h"
12 #include "services/js/js_app.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace apps { 15 namespace js {
16 16
17 namespace { 17 namespace {
18 18
19 gin::WrapperInfo g_wrapper_info = {gin::kEmbedderNativeGin}; 19 gin::WrapperInfo g_wrapper_info = {gin::kEmbedderNativeGin};
20 20
21 } // namespace 21 } // namespace
22 22
23 const char MojoInternals::kModuleName[] = "mojo/apps/js/bridge"; 23 const char MojoInternals::kModuleName[] = "services/js/bridge";
24 24
25 v8::Local<v8::Value> MojoInternals::GetModule(JSApp* js_app, 25 v8::Local<v8::Value> MojoInternals::GetModule(JSApp* js_app,
26 v8::Isolate* isolate) { 26 v8::Isolate* isolate) {
27 gin::PerIsolateData* data = gin::PerIsolateData::From(isolate); 27 gin::PerIsolateData* data = gin::PerIsolateData::From(isolate);
28 v8::Local<v8::ObjectTemplate> templ = 28 v8::Local<v8::ObjectTemplate> templ =
29 data->GetObjectTemplate(&g_wrapper_info); 29 data->GetObjectTemplate(&g_wrapper_info);
30 30
31 if (templ.IsEmpty()) { 31 if (templ.IsEmpty()) {
32 templ = gin::ObjectTemplateBuilder(isolate) 32 templ = gin::ObjectTemplateBuilder(isolate)
33 .SetMethod("requestorMessagePipeHandle", 33 .SetMethod("requestorMessagePipeHandle",
34 base::Bind(&JSApp::RequestorMessagePipeHandle, 34 base::Bind(&JSApp::RequestorMessagePipeHandle,
35 base::Unretained(js_app))) 35 base::Unretained(js_app)))
36 .SetMethod("connectToApplication", 36 .SetMethod("connectToApplication",
37 base::Bind(&JSApp::ConnectToApplication, 37 base::Bind(&JSApp::ConnectToApplication,
38 base::Unretained(js_app))) 38 base::Unretained(js_app)))
39 .SetMethod("quit", 39 .SetMethod("quit",
40 base::Bind(&JSApp::Quit, base::Unretained(js_app))) 40 base::Bind(&JSApp::Quit, base::Unretained(js_app)))
41 .Build(); 41 .Build();
42 data->SetObjectTemplate(&g_wrapper_info, templ); 42 data->SetObjectTemplate(&g_wrapper_info, templ);
43 } 43 }
44 44
45 return templ->NewInstance(); 45 return templ->NewInstance();
46 } 46 }
47 47
48 } // namespace apps 48 } // namespace js
49 } // namespace mojo 49 } // namespace mojo
OLDNEW
« no previous file with comments | « services/js/mojo_bridge_module.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698