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

Side by Side Diff: mojo/shell/out_of_process_native_runner.cc

Issue 1049993002: Get mojo_shell building inside chromium checkout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix presubmit Created 5 years, 8 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
« no previous file with comments | « mojo/shell/out_of_process_native_runner.h ('k') | mojo/shell/shell_apptest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "mojo/shell/out_of_process_native_runner.h"
6
7 #include "base/bind.h"
8 #include "base/callback_helpers.h"
9 #include "base/files/file_util.h"
10 #include "base/logging.h"
11 #include "mojo/shell/app_child_process.mojom.h"
12 #include "mojo/shell/app_child_process_host.h"
13 #include "mojo/shell/in_process_native_runner.h"
14
15 namespace mojo {
16 namespace shell {
17
18 OutOfProcessNativeRunner::OutOfProcessNativeRunner(Context* context)
19 : context_(context) {
20 }
21
22 OutOfProcessNativeRunner::~OutOfProcessNativeRunner() {
23 if (app_child_process_host_) {
24 // TODO(vtl): Race condition: If |AppChildProcessHost::DidStart()| hasn't
25 // been called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we
26 // may not have a child process to wait on.) Probably we should fix
27 // |Join()|.
28 app_child_process_host_->Join();
29 }
30 }
31
32 void OutOfProcessNativeRunner::Start(
33 const base::FilePath& app_path,
34 NativeApplicationCleanup cleanup,
35 InterfaceRequest<Application> application_request,
36 const base::Closure& app_completed_callback) {
37 app_path_ = app_path;
38
39 DCHECK(app_completed_callback_.is_null());
40 app_completed_callback_ = app_completed_callback;
41
42 app_child_process_host_.reset(new AppChildProcessHost(context_));
43 app_child_process_host_->Start();
44
45 // TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe.
46 app_child_process_host_->StartApp(
47 app_path.AsUTF8Unsafe(), cleanup == NativeApplicationCleanup::DELETE,
48 application_request.Pass(),
49 base::Bind(&OutOfProcessNativeRunner::AppCompleted,
50 base::Unretained(this)));
51 }
52
53 void OutOfProcessNativeRunner::AppCompleted(int32_t result) {
54 DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")";
55
56 app_child_process_host_.reset();
57 // This object may be deleted by this callback.
58 base::Closure app_completed_callback = app_completed_callback_;
59 app_completed_callback_.Reset();
60 app_completed_callback.Run();
61 }
62
63 scoped_ptr<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_));
69 }
70
71 } // namespace shell
72 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/out_of_process_native_runner.h ('k') | mojo/shell/shell_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698