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

Issue 47433002: Cleanup mojo_shell and sample_app a bit (Closed)

Created:
7 years, 1 month ago by abarth-chromium
Modified:
7 years, 1 month ago
CC:
chromium-reviews, Aaron Boodman, darin (slow to review), viettrungluu+watch_chromium.org, ben+mojo_chromium.org, abarth-chromium
Visibility:
Public.

Description

Cleanup mojo_shell and sample_app a bit This CL contains a number of cleanups now that the structure of mojo_shell is clearer. Specifically, 1) I've moved sample_app.cc from mojo/shell to mojo/examples/sample_app. The sample_app isn't part of the mojo_shell. It's an example app that runs on top of the shell. 2) I've merged mojo/loader into mojo/shell. Originally, I thought it would be better to keep the loader separate, but we had to introduce a direct dependency from mojo/shell to net anyway, so we might as well merge these two directories. We'll probably pull them apart again when we can make the loader into a Mojo service. As part of this cleanup, I've also removed the Job/JobImpl split because that existed only to avoid leaking net headers. This ended up simplifying the code a bit. 3) I've renamed mojo/shell/android/shell_apk to mojo/shell/android/apk to remove some of the stutter from the directory name. 4) Finally, I've added a Quit task to run.cc in the error case so that we exit the main loop when we hit this error instead of spinning forever. This change is the only behavior change in this CL. R=darin@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=231287

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+146 lines, -584 lines) Patch
A + mojo/examples/sample_app/sample_app.cc View 0 chunks +-1 lines, --1 lines 0 comments Download
D mojo/loader/DEPS View 1 chunk +0 lines, -4 lines 0 comments Download
D mojo/loader/job.h View 1 chunk +0 lines, -42 lines 0 comments Download
D mojo/loader/job.cc View 1 chunk +0 lines, -20 lines 0 comments Download
D mojo/loader/loader.h View 1 chunk +0 lines, -37 lines 0 comments Download
D mojo/loader/loader.cc View 1 chunk +0 lines, -87 lines 0 comments Download
D mojo/loader/url_request_context_getter.h View 1 chunk +0 lines, -45 lines 0 comments Download
D mojo/loader/url_request_context_getter.cc View 1 chunk +0 lines, -94 lines 0 comments Download
M mojo/mojo.gyp View 5 chunks +8 lines, -10 lines 0 comments Download
A + mojo/shell/android/apk/AndroidManifest.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A + mojo/shell/android/apk/res/layout/mojo_shell_activity.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A + mojo/shell/android/apk/res/values/strings.xml View 0 chunks +-1 lines, --1 lines 0 comments Download
A + mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java View 0 chunks +-1 lines, --1 lines 0 comments Download
A + mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java View 0 chunks +-1 lines, --1 lines 0 comments Download
A + mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/MojoShellActivity.java View 0 chunks +-1 lines, --1 lines 0 comments Download
A + mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/MojoShellApplication.java View 0 chunks +-1 lines, --1 lines 0 comments Download
D mojo/shell/android/shell_apk/AndroidManifest.xml View 1 chunk +0 lines, -28 lines 0 comments Download
D mojo/shell/android/shell_apk/res/layout/mojo_shell_activity.xml View 1 chunk +0 lines, -16 lines 0 comments Download
D mojo/shell/android/shell_apk/res/values/strings.xml View 1 chunk +0 lines, -10 lines 0 comments Download
D mojo/shell/android/shell_apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java View 1 chunk +0 lines, -20 lines 0 comments Download
D mojo/shell/android/shell_apk/src/org/chromium/mojo_shell_apk/MojoMain.java View 1 chunk +0 lines, -21 lines 0 comments Download
D mojo/shell/android/shell_apk/src/org/chromium/mojo_shell_apk/MojoShellActivity.java View 1 chunk +0 lines, -43 lines 0 comments Download
D mojo/shell/android/shell_apk/src/org/chromium/mojo_shell_apk/MojoShellApplication.java View 1 chunk +0 lines, -27 lines 0 comments Download
M mojo/shell/app_container.h View 3 chunks +4 lines, -4 lines 0 comments Download
M mojo/shell/context.h View 2 chunks +3 lines, -3 lines 0 comments Download
A mojo/shell/loader.h View 1 chunk +67 lines, -0 lines 0 comments Download
A mojo/shell/loader.cc View 1 chunk +62 lines, -0 lines 0 comments Download
M mojo/shell/run.cc View 2 chunks +2 lines, -0 lines 0 comments Download
D mojo/shell/sample_app.cc View 1 chunk +0 lines, -73 lines 0 comments Download
A + mojo/shell/url_request_context_getter.h View 3 chunks +5 lines, -5 lines 0 comments Download
A + mojo/shell/url_request_context_getter.cc View 3 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
abarth-chromium
7 years, 1 month ago (2013-10-27 07:46:57 UTC) #1
darin (slow to review)
LGTM
7 years, 1 month ago (2013-10-27 22:43:49 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/abarth@chromium.org/47433002/1
7 years, 1 month ago (2013-10-28 00:14:44 UTC) #3
commit-bot: I haz the power
7 years, 1 month ago (2013-10-28 06:28:40 UTC) #4
Message was sent while issue was closed.
Change committed as 231287

Powered by Google App Engine
This is Rietveld 408576698