summaryrefslogtreecommitdiffstats
path: root/mojo/runner
diff options
context:
space:
mode:
authorerg <erg@chromium.org>2015-11-18 14:46:57 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-18 22:47:32 +0000
commit8d23e41bbc4bdeebffe51784d483afb95f4be714 (patch)
tree79654466331b4d22b57285c76e3271651951049e /mojo/runner
parentb4a8cf7a82ae168ea915d44f5997a7e756eca6c6 (diff)
downloadchromium_src-8d23e41bbc4bdeebffe51784d483afb95f4be714.zip
chromium_src-8d23e41bbc4bdeebffe51784d483afb95f4be714.tar.gz
chromium_src-8d23e41bbc4bdeebffe51784d483afb95f4be714.tar.bz2
mojo_runner: Get --trace-start working with generic mojo_runner.
Android didn't like our magic to automatically include a connection to mojo:tracing in ApplicationImpl. This does things the explicit way: including a mojo:TracingImpl in each and every mojo application package. BUG=534895 Review URL: https://codereview.chromium.org/1459453003 Cr-Commit-Position: refs/heads/master@{#360434}
Diffstat (limited to 'mojo/runner')
-rw-r--r--mojo/runner/desktop/launcher_process.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/runner/desktop/launcher_process.cc
index 4fa6956..b55953c 100644
--- a/mojo/runner/desktop/launcher_process.cc
+++ b/mojo/runner/desktop/launcher_process.cc
@@ -15,6 +15,7 @@
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/synchronization/waitable_event.h"
+#include "base/threading/platform_thread.h"
#include "mojo/runner/context.h"
#include "mojo/runner/switches.h"
#include "mojo/shell/switches.h"
@@ -31,6 +32,8 @@ int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) {
// http://crbug.com/546644
command_line->AppendSwitch(switches::kMojoNoSandbox);
+ base::PlatformThread::SetName("mojo_runner");
+
// We want the shell::Context to outlive the MessageLoop so that pipes are
// all gracefully closed / error-out before we try to shut the Context down.
Context shell_context;