| 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" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 CHECK(gin::ConvertFromV8(isolate, module, &start)); | 38 CHECK(gin::ConvertFromV8(isolate, module, &start)); |
| 39 | 39 |
| 40 v8::Handle<v8::Value> args[] = { gin::ConvertToV8(isolate, pipe) }; | 40 v8::Handle<v8::Value> args[] = { gin::ConvertToV8(isolate, pipe) }; |
| 41 runner->Call(start, runner->global(), 1, args); | 41 runner->Call(start, runner->global(), 1, args); |
| 42 } | 42 } |
| 43 | 43 |
| 44 } // namespace | 44 } // namespace |
| 45 | 45 |
| 46 MojoRunnerDelegate::MojoRunnerDelegate() | 46 MojoRunnerDelegate::MojoRunnerDelegate() |
| 47 : ModuleRunnerDelegate(GetModuleSearchPaths()) { | 47 : ModuleRunnerDelegate(GetModuleSearchPaths()) { |
| 48 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetTemplate); | 48 AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); |
| 49 AddBuiltinModule(js::Core::kModuleName, js::Core::GetTemplate); | 49 AddBuiltinModule(js::Core::kModuleName, js::Core::GetModule); |
| 50 AddBuiltinModule(js::Support::kModuleName, js::Support::GetTemplate); | 50 AddBuiltinModule(js::Support::kModuleName, js::Support::GetModule); |
| 51 AddBuiltinModule(mojo::js::gl::kModuleName, mojo::js::gl::GetModuleTemplate); | 51 AddBuiltinModule(mojo::js::gl::kModuleName, mojo::js::gl::GetModule); |
| 52 AddBuiltinModule(Threading::kModuleName, Threading::GetTemplate); | 52 AddBuiltinModule(Threading::kModuleName, Threading::GetModule); |
| 53 } | 53 } |
| 54 | 54 |
| 55 MojoRunnerDelegate::~MojoRunnerDelegate() { | 55 MojoRunnerDelegate::~MojoRunnerDelegate() { |
| 56 } | 56 } |
| 57 | 57 |
| 58 void MojoRunnerDelegate::Start(gin::Runner* runner, | 58 void MojoRunnerDelegate::Start(gin::Runner* runner, |
| 59 MojoHandle pipe, | 59 MojoHandle pipe, |
| 60 const std::string& module) { | 60 const std::string& module) { |
| 61 gin::Runner::Scope scope(runner); | 61 gin::Runner::Scope scope(runner); |
| 62 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(runner->context()); | 62 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(runner->context()); |
| 63 registry->LoadModule(runner->isolate(), module, | 63 registry->LoadModule(runner->isolate(), module, |
| 64 base::Bind(StartCallback, runner->GetWeakPtr(), pipe)); | 64 base::Bind(StartCallback, runner->GetWeakPtr(), pipe)); |
| 65 AttemptToLoadMoreModules(runner); | 65 AttemptToLoadMoreModules(runner); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void MojoRunnerDelegate::UnhandledException(gin::Runner* runner, | 68 void MojoRunnerDelegate::UnhandledException(gin::Runner* runner, |
| 69 gin::TryCatch& try_catch) { | 69 gin::TryCatch& try_catch) { |
| 70 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); | 70 gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch); |
| 71 LOG(ERROR) << try_catch.GetStackTrace(); | 71 LOG(ERROR) << try_catch.GetStackTrace(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace apps | 74 } // namespace apps |
| 75 } // namespace mojo | 75 } // namespace mojo |
| OLD | NEW |