| 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/try_catch.h" | 12 #include "gin/try_catch.h" |
| 13 #include "mojo/apps/js/threading.h" | 13 #include "mojo/apps/js/bindings/core.h" |
| 14 #include "mojo/public/bindings/js/core.h" | 14 #include "mojo/apps/js/bindings/support.h" |
| 15 #include "mojo/public/bindings/js/support.h" | 15 #include "mojo/apps/js/bindings/threading.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace apps { | 18 namespace apps { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 // TODO(abarth): Rather than loading these modules from the file system, we | 22 // TODO(abarth): Rather than loading these modules from the file system, we |
| 23 // should load them from the network via Mojo IPC. | 23 // should load them from the network via Mojo IPC. |
| 24 std::vector<base::FilePath> GetModuleSearchPaths() { | 24 std::vector<base::FilePath> GetModuleSearchPaths() { |
| 25 std::vector<base::FilePath> search_paths(2); | 25 std::vector<base::FilePath> search_paths(2); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 void MojoRunnerDelegate::UnhandledException(gin::Runner* runner, | 66 void MojoRunnerDelegate::UnhandledException(gin::Runner* runner, |
| 67 gin::TryCatch& try_catch) { | 67 gin::TryCatch& try_catch) { |
| 68 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); | 68 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); |
| 69 LOG(ERROR) << try_catch.GetStackTrace(); | 69 LOG(ERROR) << try_catch.GetStackTrace(); |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace apps | 72 } // namespace apps |
| 73 } // namespace mojo | 73 } // namespace mojo |
| OLD | NEW |