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/shell/runner/host/out_of_process_native_runner.h" | 5 #include "mojo/shell/runner/host/out_of_process_native_runner.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 26 matching lines...) Expand all Loading... |
37 const base::Callback<void(base::ProcessId)>& pid_available_callback, | 37 const base::Callback<void(base::ProcessId)>& pid_available_callback, |
38 const base::Closure& app_completed_callback) { | 38 const base::Closure& app_completed_callback) { |
39 app_path_ = app_path; | 39 app_path_ = app_path; |
40 | 40 |
41 DCHECK(app_completed_callback_.is_null()); | 41 DCHECK(app_completed_callback_.is_null()); |
42 app_completed_callback_ = app_completed_callback; | 42 app_completed_callback_ = app_completed_callback; |
43 | 43 |
44 child_process_host_.reset(new ChildProcessHost( | 44 child_process_host_.reset(new ChildProcessHost( |
45 launch_process_runner_, delegate_, start_sandboxed, target, app_path)); | 45 launch_process_runner_, delegate_, start_sandboxed, target, app_path)); |
46 return child_process_host_->Start( | 46 return child_process_host_->Start( |
47 target.name(), pid_available_callback, | 47 target, pid_available_callback, |
48 base::Bind(&OutOfProcessNativeRunner::AppCompleted, | 48 base::Bind(&OutOfProcessNativeRunner::AppCompleted, |
49 base::Unretained(this))); | 49 base::Unretained(this))); |
50 } | 50 } |
51 | 51 |
52 void OutOfProcessNativeRunner::AppCompleted() { | 52 void OutOfProcessNativeRunner::AppCompleted() { |
53 if (child_process_host_) | 53 if (child_process_host_) |
54 child_process_host_->Join(); | 54 child_process_host_->Join(); |
55 child_process_host_.reset(); | 55 child_process_host_.reset(); |
56 // This object may be deleted by this callback. | 56 // This object may be deleted by this callback. |
57 base::Closure app_completed_callback = app_completed_callback_; | 57 base::Closure app_completed_callback = app_completed_callback_; |
58 app_completed_callback_.Reset(); | 58 app_completed_callback_.Reset(); |
59 if (!app_completed_callback.is_null()) | 59 if (!app_completed_callback.is_null()) |
60 app_completed_callback.Run(); | 60 app_completed_callback.Run(); |
61 } | 61 } |
62 | 62 |
63 OutOfProcessNativeRunnerFactory::OutOfProcessNativeRunnerFactory( | 63 OutOfProcessNativeRunnerFactory::OutOfProcessNativeRunnerFactory( |
64 base::TaskRunner* launch_process_runner, | 64 base::TaskRunner* launch_process_runner, |
65 NativeRunnerDelegate* delegate) | 65 NativeRunnerDelegate* delegate) |
66 : launch_process_runner_(launch_process_runner), delegate_(delegate) {} | 66 : launch_process_runner_(launch_process_runner), delegate_(delegate) {} |
67 OutOfProcessNativeRunnerFactory::~OutOfProcessNativeRunnerFactory() {} | 67 OutOfProcessNativeRunnerFactory::~OutOfProcessNativeRunnerFactory() {} |
68 | 68 |
69 scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create( | 69 scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create( |
70 const base::FilePath& app_path) { | 70 const base::FilePath& app_path) { |
71 return make_scoped_ptr( | 71 return make_scoped_ptr( |
72 new OutOfProcessNativeRunner(launch_process_runner_, delegate_)); | 72 new OutOfProcessNativeRunner(launch_process_runner_, delegate_)); |
73 } | 73 } |
74 | 74 |
75 } // namespace shell | 75 } // namespace shell |
76 } // namespace mojo | 76 } // namespace mojo |
OLD | NEW |