OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_runner_delegate.h" | 5 #include "mojo/apps/js/mojo_runner_delegate.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "gin/converter.h" | 9 #include "gin/converter.h" |
10 #include "gin/modules/console.h" | 10 #include "gin/modules/console.h" |
11 #include "gin/modules/module_registry.h" | 11 #include "gin/modules/module_registry.h" |
12 #include "gin/modules/timer.h" | 12 #include "gin/modules/timer.h" |
13 #include "gin/try_catch.h" | 13 #include "gin/try_catch.h" |
14 #include "mojo/apps/js/bindings/core.h" | |
15 #include "mojo/apps/js/bindings/gl/module.h" | 14 #include "mojo/apps/js/bindings/gl/module.h" |
16 #include "mojo/apps/js/bindings/monotonic_clock.h" | 15 #include "mojo/apps/js/bindings/monotonic_clock.h" |
17 #include "mojo/apps/js/bindings/support.h" | |
18 #include "mojo/apps/js/bindings/threading.h" | 16 #include "mojo/apps/js/bindings/threading.h" |
| 17 #include "mojo/bindings/js/core.h" |
| 18 #include "mojo/bindings/js/support.h" |
19 | 19 |
20 namespace mojo { | 20 namespace mojo { |
21 namespace apps { | 21 namespace apps { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 // TODO(abarth): Rather than loading these modules from the file system, we | 25 // TODO(abarth): Rather than loading these modules from the file system, we |
26 // should load them from the network via Mojo IPC. | 26 // should load them from the network via Mojo IPC. |
27 std::vector<base::FilePath> GetModuleSearchPaths() { | 27 std::vector<base::FilePath> GetModuleSearchPaths() { |
28 std::vector<base::FilePath> search_paths(2); | 28 std::vector<base::FilePath> search_paths(2); |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 } | 71 } |
72 | 72 |
73 void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner, | 73 void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner, |
74 gin::TryCatch& try_catch) { | 74 gin::TryCatch& try_catch) { |
75 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); | 75 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); |
76 LOG(ERROR) << try_catch.GetStackTrace(); | 76 LOG(ERROR) << try_catch.GetStackTrace(); |
77 } | 77 } |
78 | 78 |
79 } // namespace apps | 79 } // namespace apps |
80 } // namespace mojo | 80 } // namespace mojo |
OLD | NEW |