| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/runner/out_of_process_native_runner.h" | 5 #include "mojo/runner/out_of_process_native_runner.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 // TODO(vtl): Race condition: If |ChildProcessHost::DidStart()| hasn't been | 24 // TODO(vtl): Race condition: If |ChildProcessHost::DidStart()| hasn't been |
| 25 // called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we may | 25 // called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we may |
| 26 // not have a child process to wait on.) Probably we should fix |Join()|. | 26 // not have a child process to wait on.) Probably we should fix |Join()|. |
| 27 child_process_host_->Join(); | 27 child_process_host_->Join(); |
| 28 } | 28 } |
| 29 } | 29 } |
| 30 | 30 |
| 31 void OutOfProcessNativeRunner::Start( | 31 void OutOfProcessNativeRunner::Start( |
| 32 const base::FilePath& app_path, | 32 const base::FilePath& app_path, |
| 33 bool start_sandboxed, | 33 bool start_sandboxed, |
| 34 shell::NativeApplicationCleanup cleanup, | |
| 35 InterfaceRequest<Application> application_request, | 34 InterfaceRequest<Application> application_request, |
| 36 const base::Closure& app_completed_callback) { | 35 const base::Closure& app_completed_callback) { |
| 37 app_path_ = app_path; | 36 app_path_ = app_path; |
| 38 | 37 |
| 39 DCHECK(app_completed_callback_.is_null()); | 38 DCHECK(app_completed_callback_.is_null()); |
| 40 app_completed_callback_ = app_completed_callback; | 39 app_completed_callback_ = app_completed_callback; |
| 41 | 40 |
| 42 bool clean_app_path = cleanup == shell::NativeApplicationCleanup::DELETE; | 41 child_process_host_.reset( |
| 43 child_process_host_.reset(new ChildProcessHost(context_, start_sandboxed, | 42 new ChildProcessHost(context_, start_sandboxed, app_path)); |
| 44 app_path, clean_app_path)); | |
| 45 child_process_host_->Start(); | 43 child_process_host_->Start(); |
| 46 | 44 |
| 47 child_process_host_->StartApp( | 45 child_process_host_->StartApp( |
| 48 application_request.Pass(), | 46 application_request.Pass(), |
| 49 base::Bind(&OutOfProcessNativeRunner::AppCompleted, | 47 base::Bind(&OutOfProcessNativeRunner::AppCompleted, |
| 50 base::Unretained(this))); | 48 base::Unretained(this))); |
| 51 } | 49 } |
| 52 | 50 |
| 53 void OutOfProcessNativeRunner::AppCompleted(int32_t result) { | 51 void OutOfProcessNativeRunner::AppCompleted(int32_t result) { |
| 54 DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")"; | 52 DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")"; |
| 55 | 53 |
| 56 child_process_host_.reset(); | 54 child_process_host_.reset(); |
| 57 // This object may be deleted by this callback. | 55 // This object may be deleted by this callback. |
| 58 base::Closure app_completed_callback = app_completed_callback_; | 56 base::Closure app_completed_callback = app_completed_callback_; |
| 59 app_completed_callback_.Reset(); | 57 app_completed_callback_.Reset(); |
| 60 app_completed_callback.Run(); | 58 app_completed_callback.Run(); |
| 61 } | 59 } |
| 62 | 60 |
| 63 scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create( | 61 scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create() { |
| 64 const Options& options) { | |
| 65 if (options.force_in_process) | |
| 66 return make_scoped_ptr(new InProcessNativeRunner(context_)); | |
| 67 | |
| 68 return make_scoped_ptr(new OutOfProcessNativeRunner(context_)); | 62 return make_scoped_ptr(new OutOfProcessNativeRunner(context_)); |
| 69 } | 63 } |
| 70 | 64 |
| 71 } // namespace runner | 65 } // namespace runner |
| 72 } // namespace mojo | 66 } // namespace mojo |
| OLD | NEW |