summaryrefslogtreecommitdiffstats
path: root/mojo/apps/js/mojo_runner_delegate.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-21 17:54:37 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-21 17:54:37 +0000
commit2491f1422adfe41202cfa49194d7628ec2651a74 (patch)
tree4fced832e3dbf9bc7eb37ad5c0d3d29c591b1d3c /mojo/apps/js/mojo_runner_delegate.cc
parent91b82ad9710b98c8bb03cba768c9bd44f259a1a7 (diff)
downloadchromium_src-2491f1422adfe41202cfa49194d7628ec2651a74.zip
chromium_src-2491f1422adfe41202cfa49194d7628ec2651a74.tar.gz
chromium_src-2491f1422adfe41202cfa49194d7628ec2651a74.tar.bz2
Add a simple one shot and repeating timer API for Mojo.js.
Various further rework of bindings stuff to facilitate. Review URL: https://codereview.chromium.org/120043008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/apps/js/mojo_runner_delegate.cc')
-rw-r--r--mojo/apps/js/mojo_runner_delegate.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/mojo/apps/js/mojo_runner_delegate.cc b/mojo/apps/js/mojo_runner_delegate.cc
index 196466f..11f30b9 100644
--- a/mojo/apps/js/mojo_runner_delegate.cc
+++ b/mojo/apps/js/mojo_runner_delegate.cc
@@ -45,11 +45,11 @@ void StartCallback(base::WeakPtr<gin::Runner> runner,
MojoRunnerDelegate::MojoRunnerDelegate()
: ModuleRunnerDelegate(GetModuleSearchPaths()) {
- AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetTemplate);
- AddBuiltinModule(js::Core::kModuleName, js::Core::GetTemplate);
- AddBuiltinModule(js::Support::kModuleName, js::Support::GetTemplate);
- AddBuiltinModule(mojo::js::gl::kModuleName, mojo::js::gl::GetModuleTemplate);
- AddBuiltinModule(Threading::kModuleName, Threading::GetTemplate);
+ AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule);
+ AddBuiltinModule(js::Core::kModuleName, js::Core::GetModule);
+ AddBuiltinModule(js::Support::kModuleName, js::Support::GetModule);
+ AddBuiltinModule(mojo::js::gl::kModuleName, mojo::js::gl::GetModule);
+ AddBuiltinModule(Threading::kModuleName, Threading::GetModule);
}
MojoRunnerDelegate::~MojoRunnerDelegate() {