diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 23:30:48 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 23:30:48 +0000 |
| commit | 8d64cb67bca9666fa7c52f0f632790ca7e6fda22 (patch) | |
| tree | 8be298d2ff22dea8815fb140dc40985d290640ca /mojo/mojo_public.gypi | |
| parent | f3d8ca5cd62ee4a0894f94f14df71ae5089d0c36 (diff) | |
| download | chromium_src-8d64cb67bca9666fa7c52f0f632790ca7e6fda22.zip chromium_src-8d64cb67bca9666fa7c52f0f632790ca7e6fda22.tar.gz chromium_src-8d64cb67bca9666fa7c52f0f632790ca7e6fda22.tar.bz2 | |
mojo: terminate apps if the shell goes away
Each application <> shell connection is represented by a ShellImpl instance
on the shell side. This CL makes the Application watch its ShellPtr for pipe
errors so it can Quit() itself if the shell goes away (shell loop destroyed).
mojo_shell_tests starts using a new method to terminate all shell connections
in this CL, and waits afterward until KeepAlive quits the loop signifying that
all apps are gone. This is done prior to destroying the shell MessageLoop so
that the test ensures apps have all died before the next test. In the future
it would be a test failure if this wasn't a no-op, but we have things in the
shell that don't quit themselves right now.
The shell itself won't wait around for apps to die (as of this CL), but
~MessageLoop will still send the message to Application sides that will quit.
** NOTE ** This does not require an app build target to explicitly add magic
*.cc files to their sources. It requires selecting an appropriate
mojo_application_{chromium, standalone} library akin to mojo_environment_*.
We can possibly combine these two in the future.
BUG=394477
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287680
Review URL: https://codereview.chromium.org/394903005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_public.gypi')
| -rw-r--r-- | mojo/mojo_public.gypi | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi index 63c4692..60df553 100644 --- a/mojo/mojo_public.gypi +++ b/mojo/mojo_public.gypi @@ -182,7 +182,7 @@ }, { # GN version: //mojo/public/cpp/application - 'target_name': 'mojo_application', + 'target_name': 'mojo_application_base', 'type': 'static_library', 'sources': [ 'public/cpp/application/application_connection.h', @@ -206,6 +206,19 @@ 'mojo_application_bindings', ], }, + { + 'target_name': 'mojo_application_standalone', + 'type': 'static_library', + 'sources': [ + 'public/cpp/application/lib/application_impl_standalone.cc', + ], + 'dependencies': [ + 'mojo_application_base', + ], + 'export_dependent_settings': [ + 'mojo_application_base', + ], + }, ], 'conditions': [ ['OS == "android"', { |