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 "shell/in_process_native_runner.h" | 5 #include "shell/in_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/location.h" | 9 #include "base/location.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
11 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
12 #include "shell/native_application_support.h" | 12 #include "shell/native_application_support.h" |
13 | 13 |
14 namespace mojo { | |
15 namespace shell { | 14 namespace shell { |
16 | 15 |
17 InProcessNativeRunner::InProcessNativeRunner(Context* context) | 16 InProcessNativeRunner::InProcessNativeRunner(Context* context) |
18 : cleanup_(NativeApplicationCleanup::DONT_DELETE), app_library_(nullptr) { | 17 : cleanup_(NativeApplicationCleanup::DONT_DELETE), app_library_(nullptr) { |
19 } | 18 } |
20 | 19 |
21 InProcessNativeRunner::~InProcessNativeRunner() { | 20 InProcessNativeRunner::~InProcessNativeRunner() { |
22 // It is important to let the thread exit before unloading the DSO (when | 21 // It is important to let the thread exit before unloading the DSO (when |
23 // app_library_ is destructed), because the library may have registered | 22 // app_library_ is destructed), because the library may have registered |
24 // thread-local data and destructors to run on thread termination. | 23 // thread-local data and destructors to run on thread termination. |
25 if (thread_) { | 24 if (thread_) { |
26 DCHECK(thread_->HasBeenStarted()); | 25 DCHECK(thread_->HasBeenStarted()); |
27 DCHECK(!thread_->HasBeenJoined()); | 26 DCHECK(!thread_->HasBeenJoined()); |
28 thread_->Join(); | 27 thread_->Join(); |
29 } | 28 } |
30 } | 29 } |
31 | 30 |
32 void InProcessNativeRunner::Start( | 31 void InProcessNativeRunner::Start( |
33 const base::FilePath& app_path, | 32 const base::FilePath& app_path, |
34 NativeApplicationCleanup cleanup, | 33 NativeApplicationCleanup cleanup, |
35 InterfaceRequest<Application> application_request, | 34 mojo::InterfaceRequest<mojo::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 cleanup_ = cleanup; | 37 cleanup_ = cleanup; |
39 | 38 |
40 DCHECK(!application_request_.is_pending()); | 39 DCHECK(!application_request_.is_pending()); |
41 application_request_ = application_request.Pass(); | 40 application_request_ = application_request.Pass(); |
42 | 41 |
43 DCHECK(app_completed_callback_runner_.is_null()); | 42 DCHECK(app_completed_callback_runner_.is_null()); |
44 app_completed_callback_runner_ = | 43 app_completed_callback_runner_ = |
45 base::Bind(&base::TaskRunner::PostTask, base::MessageLoopProxy::current(), | 44 base::Bind(&base::TaskRunner::PostTask, base::MessageLoopProxy::current(), |
(...skipping 17 matching lines...) Expand all Loading... |
63 app_completed_callback_runner_.Run(); | 62 app_completed_callback_runner_.Run(); |
64 app_completed_callback_runner_.Reset(); | 63 app_completed_callback_runner_.Reset(); |
65 } | 64 } |
66 | 65 |
67 scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create( | 66 scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create( |
68 const Options& options) { | 67 const Options& options) { |
69 return make_scoped_ptr(new InProcessNativeRunner(context_)); | 68 return make_scoped_ptr(new InProcessNativeRunner(context_)); |
70 } | 69 } |
71 | 70 |
72 } // namespace shell | 71 } // namespace shell |
73 } // namespace mojo | |
OLD | NEW |