Update mojo_run to use mojo:launcher instead of mojo:kiosk_wm.

Fixes https://github.com/domokit/devtools/issues/59.

R=abarth@google.com, qsr@chromium.org

Review URL: https://codereview.chromium.org/1782443005 .

Cr-Mirrored-From: https://github.com/domokit/mojo
Cr-Mirrored-Commit: 3521661ee7561dc24eb8878ff66a34116fba1ca7

docs/mojo_run.md

diff --git a/docs/mojo_run.md b/docs/mojo_run.md
index ad4f0e2..aa60937 100644
--- a/docs/mojo_run.md
+++ b/docs/mojo_run.md
@@ -16,17 +16,13 @@
 mojo_run --shell-path path/to/shell/binary APP_URL
 ```
 
-Some applications are meant to be run embedded in a **window manager**. To run
-these, you can pass the app url using the `--embed` flag. This will run the
-window manager and pass the given url to it:
+Some applications implement ViewProvider and are run embedded in a view. To run
+these, you can pass the app url using the `--embed` flag:
 
 ```sh
 mojo_run --embed APP_URL [--android]
 ```
 
-By default, `mojo_run` uses mojo:kiosk_wm as the window manager. You can pass a
-different window manager url using the `--window-manager` flag to override this.
-
 ## Running multiple instances simultaneously
 
 `mojo_run` sets up development servers on fixed ports to facilitate caching

mojo_run

diff --git a/mojo_run b/mojo_run
index 50992b3..43f83be 100755
--- a/mojo_run
+++ b/mojo_run
@@ -30,9 +30,8 @@
 # Port on which the mojo:debugger http server will be available on the host
 # machine.
 _MOJO_DEBUGGER_PORT = 7777
-_DEFAULT_WM = 'mojo:kiosk_wm'
+_LAUNCHER = 'mojo:launcher'
 
-_WM_URL = 'mojo:window_manager'
 _DEBUGGER_URL = 'https://core.mojoapps.io/debugger.mojo'
 
 
@@ -58,10 +57,6 @@
 
   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_WM)
   parser.add_argument('--debugger', action="store_true",
                       help='Run debugger.mojo along with the app.')
 
@@ -74,12 +69,8 @@
     print e
     return 1
 
-  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))
+    shell_args.append('%s %s' % (_LAUNCHER, script_args.embed))
 
   if script_args.debugger:
     if script_args.verbose: