summaryrefslogtreecommitdiffstats
path: root/mojo/mojo.gyp
diff options
context:
space:
mode:
authorhansmuller <hansmuller@chromium.org>2014-10-01 11:01:17 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-01 18:01:56 +0000
commit06c28d7358731ae3a7788656a7c7468b813a4b3e (patch)
tree99323f5ca97edc63df330350ec4bae1000f4be2c /mojo/mojo.gyp
parent4a1a6d45342fa5242f60834ced4719e5472f9ab8 (diff)
downloadchromium_src-06c28d7358731ae3a7788656a7c7468b813a4b3e.zip
chromium_src-06c28d7358731ae3a7788656a7c7468b813a4b3e.tar.gz
chromium_src-06c28d7358731ae3a7788656a7c7468b813a4b3e.tar.bz2
Standalone Mojo Javascript application
Refactored the JSApp et al classes to enable launching apps with the content launcher (as before) as well as launching a single standalone JS app. The content handler class has been moved to its own file. The part of the JSApp Start() method that loads the initial script is now an abstract method called Load(). There are content handler and standalone versions of JSApp::Load(). The code that's specific to the standalone case is now in standalone_main.cc. The code that's specific to the content handler case is in content_handler_main.cc and content_handler_impl.{h,cc}. Currently the standalone app's filename is wired into standalone_main.cc. Once crbug.com/418797 has been fixed the filename can be passed through mojo_shell. BUG=417530 Review URL: https://codereview.chromium.org/608333002 Cr-Commit-Position: refs/heads/master@{#297675}
Diffstat (limited to 'mojo/mojo.gyp')
-rw-r--r--mojo/mojo.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index bca8aa6..a82e5ed 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -39,7 +39,8 @@
'mojo_example_service',
'mojo_geometry_lib',
'mojo_html_viewer',
- 'mojo_js',
+ 'mojo_js_content_handler',
+ 'mojo_js_standalone',
'mojo_native_viewport_service',
'mojo_network_service',
'mojo_pepper_container_app',