commit dd6c39cd1b3cafee5fdf82829be5c5e315b8efe8
author Przemyslaw Pietrzkiewicz <ppi@chromium.org> Thu Sep 17 17:09:33 2015 +0200
committer Przemyslaw Pietrzkiewicz <ppi@chromium.org> Thu Sep 17 17:09:33 2015 +0200
tree c7d3cee6c567d68e16dfb878d1cced59976bc94c
parent 47f3b812ef364e2e1d0d4aa698bc816880bbf5ed

Don't use real urls for kiosk_wm just yet.

We need to switch to real urls in one big step, having only some apps
in some contexts referenced through real urls leads to confusion.

Fixes domokit/devtools#46.

R=qsr@chromium.org

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

Cr-Mirrored-From: https://github.com/domokit/mojo
Cr-Mirrored-Commit: 2c4aa25ef08be9ad420123a2d1e3bee92c5a0fc2

docs/mojo_run.md

diff --git a/docs/mojo_run.md b/docs/mojo_run.md
index 26dd2eb..1b96f67 100644
--- a/docs/mojo_run.md
+++ b/docs/mojo_run.md
@@ -24,6 +24,5 @@
 mojo_run --embed APP_URL [--android]
 ```
 
-By default, `mojo_run` uses https://core.mojoapps.io/kiosk_wm.mojo as the window
-manager. You can pass a different window manager url using the
-`--window-manager` flag to override this.
+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.

mojo_run

diff --git a/mojo_run b/mojo_run
index 06bc627..50992b3 100755
--- a/mojo_run
+++ b/mojo_run
@@ -30,10 +30,9 @@
 # Port on which the mojo:debugger http server will be available on the host
 # machine.
 _MOJO_DEBUGGER_PORT = 7777
-_DEFAULT_WM = 'https://core.mojoapps.io/kiosk_wm.mojo'
+_DEFAULT_WM = 'mojo:kiosk_wm'
 
-_LEGACY_WM_URL = 'mojo:window_manager'
-_WM_URL = 'https://core.mojoapps.io/window_manager.mojo'
+_WM_URL = 'mojo:window_manager'
 _DEBUGGER_URL = 'https://core.mojoapps.io/debugger.mojo'
 
 
@@ -76,9 +75,6 @@
     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))