Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1524)

Side by Side Diff: mojo/runner/in_process_native_runner.cc

Issue 1118473002: [mojo] Replace MessageLoopProxy usage with ThreadTaskRunnerHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« mojo/common/handle_watcher.cc ('K') | « mojo/runner/child_process.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/message_loop/message_loop_proxy.h" 10 #include "base/thread_task_runner_handle.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 shell { 15 namespace shell {
16 16
17 InProcessNativeRunner::InProcessNativeRunner(Context* context) 17 InProcessNativeRunner::InProcessNativeRunner(Context* context)
18 : cleanup_(NativeApplicationCleanup::DONT_DELETE), app_library_(nullptr) { 18 : cleanup_(NativeApplicationCleanup::DONT_DELETE), app_library_(nullptr) {
19 } 19 }
20 20
(...skipping 14 matching lines...) Expand all
35 InterfaceRequest<Application> application_request, 35 InterfaceRequest<Application> application_request,
36 const base::Closure& app_completed_callback) { 36 const base::Closure& app_completed_callback) {
37 app_path_ = app_path; 37 app_path_ = app_path;
38 cleanup_ = cleanup; 38 cleanup_ = cleanup;
39 39
40 DCHECK(!application_request_.is_pending()); 40 DCHECK(!application_request_.is_pending());
41 application_request_ = application_request.Pass(); 41 application_request_ = application_request.Pass();
42 42
43 DCHECK(app_completed_callback_runner_.is_null()); 43 DCHECK(app_completed_callback_runner_.is_null());
44 app_completed_callback_runner_ = 44 app_completed_callback_runner_ =
45 base::Bind(&base::TaskRunner::PostTask, base::MessageLoopProxy::current(), 45 base::Bind(&base::TaskRunner::PostTask,
46 FROM_HERE, app_completed_callback); 46 base::ThreadTaskRunnerHandle::Get(),
47 FROM_HERE,
48 app_completed_callback);
47 49
48 DCHECK(!thread_); 50 DCHECK(!thread_);
49 thread_.reset(new base::DelegateSimpleThread(this, "app_thread")); 51 thread_.reset(new base::DelegateSimpleThread(this, "app_thread"));
50 thread_->Start(); 52 thread_->Start();
51 } 53 }
52 54
53 void InProcessNativeRunner::Run() { 55 void InProcessNativeRunner::Run() {
54 DVLOG(2) << "Loading/running Mojo app in process from library: " 56 DVLOG(2) << "Loading/running Mojo app in process from library: "
55 << app_path_.value() 57 << app_path_.value()
56 << " thread id=" << base::PlatformThread::CurrentId(); 58 << " thread id=" << base::PlatformThread::CurrentId();
57 59
58 // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method! 60 // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method!
59 base::NativeLibrary app_library = LoadNativeApplication(app_path_, cleanup_); 61 base::NativeLibrary app_library = LoadNativeApplication(app_path_, cleanup_);
60 app_library_.Reset(app_library); 62 app_library_.Reset(app_library);
61 RunNativeApplication(app_library, application_request_.Pass()); 63 RunNativeApplication(app_library, application_request_.Pass());
62 app_completed_callback_runner_.Run(); 64 app_completed_callback_runner_.Run();
63 app_completed_callback_runner_.Reset(); 65 app_completed_callback_runner_.Reset();
64 } 66 }
65 67
66 scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create( 68 scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create(
67 const Options& options) { 69 const Options& options) {
68 return make_scoped_ptr(new InProcessNativeRunner(context_)); 70 return make_scoped_ptr(new InProcessNativeRunner(context_));
69 } 71 }
70 72
71 } // namespace shell 73 } // namespace shell
72 } // namespace mojo 74 } // namespace mojo
OLDNEW
« mojo/common/handle_watcher.cc ('K') | « mojo/runner/child_process.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698