Index: mojo/runner/out_of_process_native_runner.cc |
diff --git a/mojo/runner/out_of_process_native_runner.cc b/mojo/runner/out_of_process_native_runner.cc |
index 608765e2b584db675d28f18062c25e560aae1d68..9623b7957721e23e0140bd3a816fd01a4fc9cb17 100644 |
--- a/mojo/runner/out_of_process_native_runner.cc |
+++ b/mojo/runner/out_of_process_native_runner.cc |
@@ -13,7 +13,7 @@ |
#include "mojo/runner/in_process_native_runner.h" |
namespace mojo { |
-namespace shell { |
+namespace runner { |
OutOfProcessNativeRunner::OutOfProcessNativeRunner(Context* context) |
: context_(context) { |
@@ -30,7 +30,7 @@ OutOfProcessNativeRunner::~OutOfProcessNativeRunner() { |
void OutOfProcessNativeRunner::Start( |
const base::FilePath& app_path, |
- NativeApplicationCleanup cleanup, |
+ shell::NativeApplicationCleanup cleanup, |
InterfaceRequest<Application> application_request, |
const base::Closure& app_completed_callback) { |
app_path_ = app_path; |
@@ -44,7 +44,8 @@ void OutOfProcessNativeRunner::Start( |
// TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe. |
child_process_host_->StartApp( |
- app_path.AsUTF8Unsafe(), cleanup == NativeApplicationCleanup::DELETE, |
+ app_path.AsUTF8Unsafe(), |
+ cleanup == shell::NativeApplicationCleanup::DELETE, |
application_request.Pass(), |
base::Bind(&OutOfProcessNativeRunner::AppCompleted, |
base::Unretained(this))); |
@@ -60,7 +61,7 @@ void OutOfProcessNativeRunner::AppCompleted(int32_t result) { |
app_completed_callback.Run(); |
} |
-scoped_ptr<NativeRunner> OutOfProcessNativeRunnerFactory::Create( |
+scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create( |
const Options& options) { |
if (options.force_in_process) |
return make_scoped_ptr(new InProcessNativeRunner(context_)); |
@@ -68,5 +69,5 @@ scoped_ptr<NativeRunner> OutOfProcessNativeRunnerFactory::Create( |
return make_scoped_ptr(new OutOfProcessNativeRunner(context_)); |
} |
-} // namespace shell |
+} // namespace runner |
} // namespace mojo |