Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Issue 1082513002: Revert of Simplify mojo_shell since it's now only used for Mandoline. (Closed)

Created:
5 years, 8 months ago by msw
Modified:
5 years, 8 months ago
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, darin (slow to review), ben+mojo_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Simplify mojo_shell since it's now only used for Mandoline. (patchset #6 id:100001 of https://codereview.chromium.org/1057603003/) Reason for revert: This CL causes problems for application testing: 1) Removing url-mappings breaks the ability to mock out service dependencies of test applications. 2) We want to connect directly to the test applications specified on the command line, not mojo:window_manager for apptests. 3) The apptest_runner.py currently uses --args-for, but that doesn't matter so much... I've started working around these issues in WIP a CL, <https://codereview.chromium.org/1070463003/>;, but it would be better to not let this CL bake if we go intend to revert some of its behavior changes. Original issue's description: > Simplify mojo_shell since it's now only used for Mandoline. > > -no need to map kiosk_wm to window_manager, instead, make kiosk_wm's binary output be window_manager.mojom > -no need for app-specific args, instead use base::CommandLine. This is important for Mandoline since we'll be sharing code with Chrome which does use these flags. > -mojo_shell url is enough to start a browser now > > Committed: https://crrev.com/143eb32f63bd929f7d730970e2477804f318a7eb > Cr-Commit-Position: refs/heads/master@{#324579} TBR=ben@chromium.org,jam@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Committed: https://crrev.com/f1d1609fce75c570455aaa526f6023ea97a80c0d Cr-Commit-Position: refs/heads/master@{#324712}

Patch Set 1 #

Patch Set 2 : Manual revert #

Patch Set 3 : Sync and rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+598 lines, -129 lines) Patch
M mojo/application/application_runner_chromium.cc View 1 2 chunks +1 line, -13 lines 0 comments Download
M mojo/services/BUILD.gn View 1 2 chunks +2 lines, -2 lines 0 comments Download
M mojo/services/html_viewer/html_viewer.cc View 1 2 chunks +11 lines, -1 line 0 comments Download
A + mojo/services/html_viewer/view_url.py View 1 2 chunks +10 lines, -31 lines 0 comments Download
M mojo/services/kiosk_wm/BUILD.gn View 1 1 chunk +1 line, -4 lines 0 comments Download
M mojo/services/kiosk_wm/kiosk_wm.cc View 1 2 2 chunks +3 lines, -13 lines 0 comments Download
M mojo/services/window_manager/BUILD.gn View 1 3 chunks +18 lines, -19 lines 0 comments Download
M mojo/services/window_manager/window_manager_apptest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M mojo/shell/BUILD.gn View 1 2 2 chunks +3 lines, -0 lines 0 comments Download
M mojo/shell/android/main.cc View 1 3 chunks +9 lines, -2 lines 0 comments Download
M mojo/shell/application_manager/application_manager.h View 1 5 chunks +14 lines, -0 lines 0 comments Download
M mojo/shell/application_manager/application_manager.cc View 1 5 chunks +64 lines, -14 lines 0 comments Download
M mojo/shell/application_manager/application_manager_unittest.cc View 1 3 chunks +113 lines, -0 lines 0 comments Download
A mojo/shell/command_line_util.h View 1 1 chunk +38 lines, -0 lines 0 comments Download
A mojo/shell/command_line_util.cc View 1 1 chunk +90 lines, -0 lines 0 comments Download
A mojo/shell/command_line_util_unittest.cc View 1 1 chunk +83 lines, -0 lines 0 comments Download
M mojo/shell/context.cc View 1 2 chunks +17 lines, -0 lines 0 comments Download
M mojo/shell/desktop/launcher_process.cc View 1 5 chunks +52 lines, -6 lines 0 comments Download
M mojo/shell/native_application_support.cc View 1 2 chunks +0 lines, -21 lines 0 comments Download
M mojo/shell/switches.h View 1 2 chunks +6 lines, -1 line 0 comments Download
M mojo/shell/switches.cc View 1 2 chunks +42 lines, -0 lines 0 comments Download
M mojo/shell/url_resolver_unittest.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M mojo/tools/android_mojo_shell.py View 1 1 chunk +19 lines, -1 line 0 comments Download

Messages

Total messages: 15 (6 generated)
msw
Created Revert of Simplify mojo_shell since it's now only used for Mandoline.
5 years, 8 months ago (2015-04-10 22:45:51 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1082513002/1
5 years, 8 months ago (2015-04-10 22:46:53 UTC) #2
commit-bot: I haz the power
Failed to apply patch for mojo/shell/BUILD.gn: While running git apply --index -3 -p1; error: patch ...
5 years, 8 months ago (2015-04-10 22:52:00 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1082513002/290001
5 years, 8 months ago (2015-04-10 22:57:38 UTC) #7
commit-bot: I haz the power
Failed to apply patch for mojo/shell/BUILD.gn: While running git apply --index -3 -p1; error: patch ...
5 years, 8 months ago (2015-04-10 22:59:55 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1082513002/310001
5 years, 8 months ago (2015-04-10 23:42:22 UTC) #12
commit-bot: I haz the power
Committed patchset #3 (id:310001)
5 years, 8 months ago (2015-04-10 23:44:38 UTC) #13
commit-bot: I haz the power
Patchset 3 (id:??) landed as https://crrev.com/f1d1609fce75c570455aaa526f6023ea97a80c0d Cr-Commit-Position: refs/heads/master@{#324712}
5 years, 8 months ago (2015-04-10 23:45:29 UTC) #14
jam
5 years, 8 months ago (2015-04-13 14:53:59 UTC) #15
Message was sent while issue was closed.
Regarding 1: I was thinking that tests could use
Context::url_resolver()->AddURLMapping() method to setup whatever mapping they
need; i.e. it's not clear to me why we need this generic command-line method as
well.

2: I'm not sure what this means, can you expand?

Powered by Google App Engine
This is Rietveld 408576698