| Index: mojo/runner/in_process_native_runner.cc
|
| diff --git a/mojo/runner/in_process_native_runner.cc b/mojo/runner/in_process_native_runner.cc
|
| index ff4f0ba3ad54372793a27b4015488c3016bbfd89..b5a8b27c945842aa78748f9675a73db6e0076778 100644
|
| --- a/mojo/runner/in_process_native_runner.cc
|
| +++ b/mojo/runner/in_process_native_runner.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "mojo/runner/native_application_support.h"
|
| +#include "mojo/runner/out_of_process_native_runner.h"
|
|
|
| namespace mojo {
|
| namespace runner {
|
| @@ -61,7 +62,11 @@ void InProcessNativeRunner::Run() {
|
| app_completed_callback_runner_.Reset();
|
| }
|
|
|
| -scoped_ptr<shell::NativeRunner> InProcessNativeRunnerFactory::Create() {
|
| +scoped_ptr<shell::NativeRunner> InProcessNativeRunnerFactory::Create(
|
| + const base::FilePath& app_path) {
|
| + // Non-Mojo apps are always run in a new process.
|
| + if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".mojo")))
|
| + return make_scoped_ptr(new OutOfProcessNativeRunner(context_));
|
| return make_scoped_ptr(new InProcessNativeRunner(context_));
|
| }
|
|
|
|
|