Chromium Code Reviews| Index: services/js/js_app_runner_delegate.cc |
| diff --git a/services/js/js_app_runner_delegate.cc b/services/js/js_app_runner_delegate.cc |
| index 999bc6305cac3cb45f361bf0ba1c992c5969fe43..4c453752c2b7a3b782c2ed1508275da46064c452 100644 |
| --- a/services/js/js_app_runner_delegate.cc |
| +++ b/services/js/js_app_runner_delegate.cc |
| @@ -11,7 +11,6 @@ |
| #include "mojo/edk/js/support.h" |
| #include "mojo/edk/js/threading.h" |
| -namespace mojo { |
| namespace js { |
| namespace { |
| @@ -29,9 +28,11 @@ std::vector<base::FilePath> GetModuleSearchPaths() { |
| JSAppRunnerDelegate::JSAppRunnerDelegate() |
| : ModuleRunnerDelegate(GetModuleSearchPaths()) { |
| AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule); |
| - AddBuiltinModule(Core::kModuleName, Core::GetModule); |
| - AddBuiltinModule(Support::kModuleName, Support::GetModule); |
| - AddBuiltinModule(Threading::kModuleName, Threading::GetModule); |
| + AddBuiltinModule(mojo::js::Core::kModuleName, mojo::js::Core::GetModule); |
| + AddBuiltinModule(mojo::js::Support::kModuleName, |
| + mojo::js::Support::GetModule); |
| + AddBuiltinModule(mojo::js::Threading::kModuleName, |
| + mojo::js::Threading::GetModule); |
|
hansmuller
2014/12/05 23:54:02
NICE.
|
| } |
| JSAppRunnerDelegate::~JSAppRunnerDelegate() { |
| @@ -43,6 +44,5 @@ void JSAppRunnerDelegate::UnhandledException(gin::ShellRunner* runner, |
| LOG(ERROR) << try_catch.GetStackTrace(); |
| } |
| -} // namespace mojo |
| } // namespace js |