diff options
| author | sky <sky@chromium.org> | 2016-03-22 14:44:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 21:45:57 +0000 |
| commit | 340545a9d2c2bf94d93421bbb6bfa40596ae4523 (patch) | |
| tree | 7e13a15630e87d0c8c0bd19a2bacd1062eebdbbf /ash | |
| parent | 56d49295ef5c22d1fbc71d491494944cf1709bb3 (diff) | |
| download | chromium_src-340545a9d2c2bf94d93421bbb6bfa40596ae4523.zip chromium_src-340545a9d2c2bf94d93421bbb6bfa40596ae4523.tar.gz chromium_src-340545a9d2c2bf94d93421bbb6bfa40596ae4523.tar.bz2 | |
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}
Review URL: https://codereview.chromium.org/1819063002
Cr-Commit-Position: refs/heads/master@{#382688}
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, 0 insertions, 6 deletions
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc index 15a5186..16585a3 100644 --- a/ash/mus/sysui_application.cc +++ b/ash/mus/sysui_application.cc @@ -16,7 +16,6 @@ #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" @@ -289,9 +288,5 @@ 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 2535c5e0..dba0f5e 100644 --- a/ash/mus/sysui_application.h +++ b/ash/mus/sysui_application.h @@ -26,7 +26,6 @@ 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_; |