| Index: mojo/shell/standalone/desktop/launcher_process.cc
|
| diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/shell/standalone/desktop/launcher_process.cc
|
| similarity index 78%
|
| rename from mojo/runner/desktop/launcher_process.cc
|
| rename to mojo/shell/standalone/desktop/launcher_process.cc
|
| index 735466139d08264f0b09204c2042550d77b2978d..331551e517c9c207aba9301d6233ad4f603a788b 100644
|
| --- a/mojo/runner/desktop/launcher_process.cc
|
| +++ b/mojo/shell/standalone/desktop/launcher_process.cc
|
| @@ -17,12 +17,12 @@
|
| #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/standalone/context.h"
|
| +#include "mojo/shell/standalone/switches.h"
|
| #include "mojo/shell/switches.h"
|
|
|
| namespace mojo {
|
| -namespace runner {
|
| +namespace shell {
|
|
|
| int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) {
|
| #if !defined(OFFICIAL_BUILD)
|
| @@ -38,8 +38,8 @@ int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) {
|
|
|
| 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.
|
| + // We want the 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;
|
| {
|
| base::MessageLoop message_loop;
|
| @@ -54,10 +54,9 @@ int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) {
|
| base::Bind(&Context::RunCommandLineApplication,
|
| base::Unretained(&shell_context), base::Closure()));
|
| } else {
|
| - message_loop.PostTask(FROM_HERE,
|
| - base::Bind(&mojo::runner::Context::Run,
|
| - base::Unretained(&shell_context),
|
| - mojo_url));
|
| + message_loop.PostTask(
|
| + FROM_HERE, base::Bind(&mojo::shell::Context::Run,
|
| + base::Unretained(&shell_context), mojo_url));
|
| }
|
| message_loop.Run();
|
|
|
| @@ -68,5 +67,5 @@ int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) {
|
| return 0;
|
| }
|
|
|
| -} // namespace runner
|
| +} // namespace shell
|
| } // namespace mojo
|
|
|