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/edk/js/mojo_runner_delegate.h" | 5 #include "mojo/edk/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/edk/js/core.h" | 14 #include "mojo/edk/js/core.h" |
15 #include "mojo/edk/js/handle.h" | 15 #include "mojo/edk/js/handle.h" |
16 #include "mojo/edk/js/support.h" | 16 #include "mojo/edk/js/support.h" |
17 #include "mojo/edk/js/threading.h" | 17 #include "mojo/edk/js/threading.h" |
18 | 18 |
19 namespace mojo { | 19 namespace mojo { |
20 namespace edk { | 20 namespace edk { |
| 21 namespace js { |
21 | 22 |
22 namespace { | 23 namespace { |
23 | 24 |
24 // 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 |
25 // should load them from the network via Mojo IPC. | 26 // should load them from the network via Mojo IPC. |
26 std::vector<base::FilePath> GetModuleSearchPaths() { | 27 std::vector<base::FilePath> GetModuleSearchPaths() { |
27 std::vector<base::FilePath> search_paths(2); | 28 std::vector<base::FilePath> search_paths(2); |
28 PathService::Get(base::DIR_SOURCE_ROOT, &search_paths[0]); | 29 PathService::Get(base::DIR_SOURCE_ROOT, &search_paths[0]); |
29 PathService::Get(base::DIR_EXE, &search_paths[1]); | 30 PathService::Get(base::DIR_EXE, &search_paths[1]); |
30 search_paths[1] = search_paths[1].AppendASCII("gen"); | 31 search_paths[1] = search_paths[1].AppendASCII("gen"); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 base::Bind(StartCallback, runner->GetWeakPtr(), pipe)); | 68 base::Bind(StartCallback, runner->GetWeakPtr(), pipe)); |
68 AttemptToLoadMoreModules(runner); | 69 AttemptToLoadMoreModules(runner); |
69 } | 70 } |
70 | 71 |
71 void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner, | 72 void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner, |
72 gin::TryCatch& try_catch) { | 73 gin::TryCatch& try_catch) { |
73 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); | 74 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); |
74 LOG(ERROR) << try_catch.GetStackTrace(); | 75 LOG(ERROR) << try_catch.GetStackTrace(); |
75 } | 76 } |
76 | 77 |
| 78 } // namespace js |
77 } // namespace edk | 79 } // namespace edk |
78 } // namespace mojo | 80 } // namespace mojo |
OLD | NEW |