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

Side by Side Diff: mojo/edk/js/support.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 | « mojo/edk/js/mojo_runner_delegate.h ('k') | mojo/edk/js/test/BUILD.gn » ('j') | 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/edk/js/support.h" 5 #include "mojo/edk/js/support.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "gin/arguments.h" 8 #include "gin/arguments.h"
9 #include "gin/converter.h" 9 #include "gin/converter.h"
10 #include "gin/function_template.h" 10 #include "gin/function_template.h"
11 #include "gin/object_template_builder.h" 11 #include "gin/object_template_builder.h"
12 #include "gin/per_isolate_data.h" 12 #include "gin/per_isolate_data.h"
13 #include "gin/public/wrapper_info.h" 13 #include "gin/public/wrapper_info.h"
14 #include "gin/wrappable.h" 14 #include "gin/wrappable.h"
15 #include "mojo/edk/js/handle.h" 15 #include "mojo/edk/js/handle.h"
16 #include "mojo/edk/js/waiting_callback.h" 16 #include "mojo/edk/js/waiting_callback.h"
17 #include "third_party/mojo/src/mojo/public/cpp/system/core.h" 17 #include "mojo/public/cpp/system/core.h"
18 18
19 namespace mojo { 19 namespace mojo {
20 namespace edk { 20 namespace edk {
21 21
22 namespace { 22 namespace {
23 23
24 WaitingCallback* AsyncWait(const gin::Arguments& args, 24 WaitingCallback* AsyncWait(const gin::Arguments& args,
25 gin::Handle<HandleWrapper> handle, 25 gin::Handle<HandleWrapper> handle,
26 MojoHandleSignals signals, 26 MojoHandleSignals signals,
27 v8::Handle<v8::Function> callback) { 27 v8::Handle<v8::Function> callback) {
(...skipping 23 matching lines...) Expand all
51 .Build(); 51 .Build();
52 52
53 data->SetObjectTemplate(&g_wrapper_info, templ); 53 data->SetObjectTemplate(&g_wrapper_info, templ);
54 } 54 }
55 55
56 return templ->NewInstance(); 56 return templ->NewInstance();
57 } 57 }
58 58
59 } // namespace edk 59 } // namespace edk
60 } // namespace mojo 60 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/js/mojo_runner_delegate.h ('k') | mojo/edk/js/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698