summaryrefslogtreecommitdiffstats
path: root/mojo/services/tracing/tracing_app.cc
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2016-03-21 14:12:35 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-21 21:14:00 +0000
commita50f9840749052fbdec087a304548217cc6fd00b (patch)
tree97a63d4c0af4422d58f5a56ac9d0895dfba8d547 /mojo/services/tracing/tracing_app.cc
parentd1b5f3a6dc60c0d00e9eca6476e0c3bc0a773b3b (diff)
downloadchromium_src-a50f9840749052fbdec087a304548217cc6fd00b.zip
chromium_src-a50f9840749052fbdec087a304548217cc6fd00b.tar.gz
chromium_src-a50f9840749052fbdec087a304548217cc6fd00b.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 Review URL: https://codereview.chromium.org/1819063002 Cr-Commit-Position: refs/heads/master@{#382389}
Diffstat (limited to 'mojo/services/tracing/tracing_app.cc')
-rw-r--r--mojo/services/tracing/tracing_app.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/mojo/services/tracing/tracing_app.cc b/mojo/services/tracing/tracing_app.cc
index 65b4421..d921a6d 100644
--- a/mojo/services/tracing/tracing_app.cc
+++ b/mojo/services/tracing/tracing_app.cc
@@ -42,8 +42,12 @@ bool TracingApp::AcceptConnection(mojo::Connection* connection) {
return true;
}
-void TracingApp::ShellConnectionLost() {
+bool TracingApp::ShellConnectionLost() {
+ // TODO(beng): This is only required because TracingApp isn't run by
+ // ApplicationRunner - instead it's launched automatically by the standalone
+ // shell. It shouldn't be.
base::MessageLoop::current()->QuitWhenIdle();
+ return false;
}
void TracingApp::Create(mojo::Connection* connection,