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 /ash | |
| 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 '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_; |