| OLD | NEW |
| 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 "mojo/apps/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" | 11 #include "mojo/apps/js/js_app.h" |
| 12 #include "mojo/bindings/js/handle.h" | 12 #include "mojo/edk/js/handle.h" |
| 13 | 13 |
| 14 namespace mojo { | 14 namespace mojo { |
| 15 namespace apps { | 15 namespace apps { |
| 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 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 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 apps |
| 49 } // namespace mojo | 49 } // namespace mojo |
| OLD | NEW |