| Index: mojo/shell/public/cpp/lib/application_runner.cc
|
| diff --git a/mojo/shell/public/cpp/lib/application_runner.cc b/mojo/shell/public/cpp/lib/application_runner.cc
|
| index dd9be48f3401c27be453e4fbb5a433ae44140044..3a358608c2a5b759f4e4ef65cc52d699fd3623a9 100644
|
| --- a/mojo/shell/public/cpp/lib/application_runner.cc
|
| +++ b/mojo/shell/public/cpp/lib/application_runner.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/process/launch.h"
|
| +#include "mojo/message_pump/message_pump_mojo.h"
|
| #include "mojo/shell/public/cpp/shell_client.h"
|
| #include "mojo/shell/public/cpp/shell_connection.h"
|
|
|
| @@ -19,7 +20,7 @@
|
|
|
| ApplicationRunner::ApplicationRunner(ShellClient* client)
|
| : client_(scoped_ptr<ShellClient>(client)),
|
| - message_loop_type_(base::MessageLoop::TYPE_DEFAULT),
|
| + message_loop_type_(base::MessageLoop::TYPE_CUSTOM),
|
| has_run_(false) {}
|
|
|
| ApplicationRunner::~ApplicationRunner() {}
|
| @@ -48,7 +49,10 @@
|
|
|
| {
|
| scoped_ptr<base::MessageLoop> loop;
|
| - loop.reset(new base::MessageLoop(message_loop_type_));
|
| + if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM)
|
| + loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
|
| + else
|
| + loop.reset(new base::MessageLoop(message_loop_type_));
|
|
|
| connection_.reset(new ShellConnection(
|
| client_.get(),
|
|
|