Add mojo_run --embed APP_URL and update wm urls.

mojo/devtools/common/mojo_run

Index: mojo/devtools/common/mojo_run
diff --git a/mojo/devtools/common/mojo_run b/mojo/devtools/common/mojo_run
index 554eeabb90958991f40688c6fefce6611069e6af..541afb9d669a1f31855a07d5d1a41e80e97ba83d 100755
--- a/mojo/devtools/common/mojo_run
+++ b/mojo/devtools/common/mojo_run
@@ -36,7 +36,10 @@ Any arguments not recognized by the script will be passed on as shell arguments.
 # Port on which the mojo:debugger http server will be available on the host
 # machine.
 _MOJO_DEBUGGER_PORT = 7777
-_DEFAULT_WINDOW_MANAGER = "mojo:kiosk_wm"
+_DEFAULT_WM = 'https://core.mojoapps.io/kiosk_wm.mojo'

[etiennej, 2015/08/10 11:18:50]

As I understand it, this CL changes the default window manager from the
locally-built one to the one from the cloud. Is it really what we want?

Have you considered adding a url mapping to map core.mojoapps.io to the local
build directory?

[ppi, 2015/08/10 11:30:41]

When running within a mojo checkout, https://core.mojoapps.io/ *is* mapped to
the local build directory, see
https://github.com/domokit/mojo/blob/master/README.md#development-server .

When running in a standalone checkout, the one from the cloud is what we want.

+
+_LEGACY_WM_URL = 'mojo:window_manager'
+_WM_URL = 'https://core.mojoapps.io/window_manager.mojo'
 
 
 def _configure_debugger(shell):
@@ -57,12 +60,14 @@ def main():
   parser = argparse.ArgumentParser(usage=_USAGE, description=_DESCRIPTION)
   shell_config.add_shell_arguments(parser)
 
-  parser.add_argument('--no-debugger', action="store_true",
-                      help='Do not spawn mojo:debugger.')
-  parser.add_argument('--window-manager', default=_DEFAULT_WINDOW_MANAGER,
+  parser.add_argument('--embed', type=str,
+                      help='Url to be embedded in the window manager.')
+  parser.add_argument('--window-manager', default=_DEFAULT_WM,
                       help='Window manager app to be mapped as '
                       'mojo:window_manager. By default it is ' +
-                      _DEFAULT_WINDOW_MANAGER)
+                      _DEFAULT_WM)
+  parser.add_argument('--no-debugger', action="store_true",
+                      help='Do not spawn mojo:debugger.')
 
   script_args, shell_args = parser.parse_known_args()
 
@@ -73,6 +78,16 @@ def main():
     print e
     return 1
 
+  shell_args = shell_arguments.append_to_argument(shell_args, '--url-mappings=',
+                                                  '%s=%s' % (_LEGACY_WM_URL,
+                                                  script_args.window_manager))
+  shell_args = shell_arguments.append_to_argument(shell_args, '--url-mappings=',
+                                                  '%s=%s' % (_WM_URL,
+                                                  script_args.window_manager))
+
+  if script_args.embed:
+    shell_args.append('%s %s' % (script_args.window_manager, script_args.embed))
+
   if not script_args.no_debugger:
     if script_args.verbose:
       print 'Spawning mojo:debugger, use `mojo_debug` to inspect the shell.'
@@ -80,10 +95,6 @@ def main():
       print '  pass --no-debugger to skip spawning mojo:debugger.'
     shell_args.extend(_configure_debugger(shell))
 
-  shell_args = shell_arguments.append_to_argument(shell_args, '--url-mappings=',
-                                                  'mojo:window_manager=%s' %
-                                                  script_args.window_manager)
-
   if script_args.verbose:
     print "Shell arguments: " + str(shell_args)