diff options
| author | esprehn <esprehn@chromium.org> | 2016-03-21 17:41:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 00:43:15 +0000 |
| commit | 0ebf9a924d744ef98948ecb4f5d9e9a6fd3b42bf (patch) | |
| tree | 36f47266a3c2cd6768fe0aa0a8a329096679c3eb /mash/wm | |
| parent | 5ee3f242cefebba7eb0f05424e7308f9158d8388 (diff) | |
| download | chromium_src-0ebf9a924d744ef98948ecb4f5d9e9a6fd3b42bf.zip chromium_src-0ebf9a924d744ef98948ecb4f5d9e9a6fd3b42bf.tar.gz chromium_src-0ebf9a924d744ef98948ecb4f5d9e9a6fd3b42bf.tar.bz2 | |
Revert of Quit the message loop by default in ShellConnectionLost when ApplicationRunner is used (patchset #2 id:20001 of https://codereview.chromium.org/1819063002/ )
Reason for revert:
Looks like to made the mojo_apptests go red. I think this is also making MUS tests fail?
https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/39128
Original issue's description:
> Quit the message loop by default in ShellConnectionLost when ApplicationRunner is used
>
> This was originally at https://codereview.chromium.org/1814223002/ , but Ben is out and
> I need this for tests, so I'm taking over.
>
> BUG=none
> TEST=covered by tests
> TBR=ben@chromium.org
> R=ben@chromium.org
>
> Committed: https://crrev.com/a50f9840749052fbdec087a304548217cc6fd00b
> Cr-Commit-Position: refs/heads/master@{#382389}
TBR=ben@chromium.org,sky@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
Review URL: https://codereview.chromium.org/1821913002
Cr-Commit-Position: refs/heads/master@{#382460}
Diffstat (limited to 'mash/wm')
| -rw-r--r-- | mash/wm/window_manager_application.cc | 4 | ||||
| -rw-r--r-- | mash/wm/window_manager_application.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc index 57fb884..606de45 100644 --- a/mash/wm/window_manager_application.cc +++ b/mash/wm/window_manager_application.cc @@ -127,6 +127,10 @@ bool WindowManagerApplication::AcceptConnection(mojo::Connection* connection) { return true; } +void WindowManagerApplication::ShellConnectionLost() { + _exit(1); +} + void WindowManagerApplication::Create( mojo::Connection* connection, mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> request) { diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h index b6cd495..5ca2725 100644 --- a/mash/wm/window_manager_application.h +++ b/mash/wm/window_manager_application.h @@ -90,6 +90,7 @@ class WindowManagerApplication void Initialize(mojo::Connector* connector, const mojo::Identity& identity, uint32_t id) override; bool AcceptConnection(mojo::Connection* connection) override; + void ShellConnectionLost() override; // InterfaceFactory<mash::wm::mojom::UserWindowController>: void Create(mojo::Connection* connection, |