diff options
| author | ben <ben@chromium.org> | 2016-03-16 21:40:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 04:41:55 +0000 |
| commit | d146bb0affa82f8a910fe99d23845ed542395ebe (patch) | |
| tree | ef0e5ee6480b11d0fe2d74d3fc4fe1cc00e9e2bf /ash | |
| parent | 2e0ba7b22dc533d059da03dbee4824e036754b2a (diff) | |
| download | chromium_src-d146bb0affa82f8a910fe99d23845ed542395ebe.zip chromium_src-d146bb0affa82f8a910fe99d23845ed542395ebe.tar.gz chromium_src-d146bb0affa82f8a910fe99d23845ed542395ebe.tar.bz2 | |
Cascade shutdown of instances
BUG=
Review URL: https://codereview.chromium.org/1810713002
Cr-Commit-Position: refs/heads/master@{#381660}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/mus/sysui_application.cc | 5 | ||||
| -rw-r--r-- | ash/mus/sysui_application.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc index 16585a3..15a5186 100644 --- a/ash/mus/sysui_application.cc +++ b/ash/mus/sysui_application.cc @@ -16,6 +16,7 @@ #include "ash/shell_window_ids.h" #include "base/bind.h" #include "base/files/file_path.h" +#include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/threading/sequenced_worker_pool.h" #include "components/mus/public/cpp/property_type_converters.h" @@ -288,5 +289,9 @@ bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { return true; } +void SysUIApplication::ShellConnectionLost() { + base::MessageLoop::current()->QuitWhenIdle(); +} + } // namespace sysui } // namespace ash diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h index dba0f5e..2535c5e0 100644 --- a/ash/mus/sysui_application.h +++ b/ash/mus/sysui_application.h @@ -26,6 +26,7 @@ class SysUIApplication : public mojo::ShellClient { const mojo::Identity& identity, uint32_t id) override; bool AcceptConnection(mojo::Connection* connection) override; + void ShellConnectionLost() override; mojo::TracingImpl tracing_; scoped_ptr<AshInit> ash_init_; |