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/in_process_native_runner.h" | 5 #include "mojo/runner/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/thread_task_runner_handle.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 "mojo/runner/native_application_support.h" | 12 #include "mojo/runner/native_application_support.h" |
13 | 13 |
14 namespace mojo { | 14 namespace mojo { |
15 namespace runner { | 15 namespace runner { |
16 | 16 |
17 InProcessNativeRunner::InProcessNativeRunner(Context* context) | 17 InProcessNativeRunner::InProcessNativeRunner(Context* context) |
18 : cleanup_(shell::NativeApplicationCleanup::DONT_DELETE), | 18 : cleanup_(shell::NativeApplicationCleanup::DONT_DELETE), |
19 app_library_(nullptr) { | 19 app_library_(nullptr) { |
20 } | 20 } |
(...skipping 15 matching lines...) Expand all Loading... |
36 InterfaceRequest<Application> application_request, | 36 InterfaceRequest<Application> application_request, |
37 const base::Closure& app_completed_callback) { | 37 const base::Closure& app_completed_callback) { |
38 app_path_ = app_path; | 38 app_path_ = app_path; |
39 cleanup_ = cleanup; | 39 cleanup_ = cleanup; |
40 | 40 |
41 DCHECK(!application_request_.is_pending()); | 41 DCHECK(!application_request_.is_pending()); |
42 application_request_ = application_request.Pass(); | 42 application_request_ = application_request.Pass(); |
43 | 43 |
44 DCHECK(app_completed_callback_runner_.is_null()); | 44 DCHECK(app_completed_callback_runner_.is_null()); |
45 app_completed_callback_runner_ = | 45 app_completed_callback_runner_ = |
46 base::Bind(&base::TaskRunner::PostTask, | 46 base::Bind(&base::TaskRunner::PostTask, base::MessageLoopProxy::current(), |
47 base::ThreadTaskRunnerHandle::Get(), | 47 FROM_HERE, app_completed_callback); |
48 FROM_HERE, | |
49 app_completed_callback); | |
50 | 48 |
51 DCHECK(!thread_); | 49 DCHECK(!thread_); |
52 thread_.reset(new base::DelegateSimpleThread(this, "app_thread")); | 50 thread_.reset(new base::DelegateSimpleThread(this, "app_thread")); |
53 thread_->Start(); | 51 thread_->Start(); |
54 } | 52 } |
55 | 53 |
56 void InProcessNativeRunner::Run() { | 54 void InProcessNativeRunner::Run() { |
57 DVLOG(2) << "Loading/running Mojo app in process from library: " | 55 DVLOG(2) << "Loading/running Mojo app in process from library: " |
58 << app_path_.value() | 56 << app_path_.value() |
59 << " thread id=" << base::PlatformThread::CurrentId(); | 57 << " thread id=" << base::PlatformThread::CurrentId(); |
60 | 58 |
61 // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method! | 59 // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method! |
62 base::NativeLibrary app_library = LoadNativeApplication(app_path_, cleanup_); | 60 base::NativeLibrary app_library = LoadNativeApplication(app_path_, cleanup_); |
63 app_library_.Reset(app_library); | 61 app_library_.Reset(app_library); |
64 RunNativeApplication(app_library, application_request_.Pass()); | 62 RunNativeApplication(app_library, application_request_.Pass()); |
65 app_completed_callback_runner_.Run(); | 63 app_completed_callback_runner_.Run(); |
66 app_completed_callback_runner_.Reset(); | 64 app_completed_callback_runner_.Reset(); |
67 } | 65 } |
68 | 66 |
69 scoped_ptr<shell::NativeRunner> InProcessNativeRunnerFactory::Create( | 67 scoped_ptr<shell::NativeRunner> InProcessNativeRunnerFactory::Create( |
70 const Options& options) { | 68 const Options& options) { |
71 return make_scoped_ptr(new InProcessNativeRunner(context_)); | 69 return make_scoped_ptr(new InProcessNativeRunner(context_)); |
72 } | 70 } |
73 | 71 |
74 } // namespace runner | 72 } // namespace runner |
75 } // namespace mojo | 73 } // namespace mojo |
OLD | NEW |