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

Unified Diff: shell/child_process_host.cc

Issue 1341873002: Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: shell/child_process_host.cc
diff --git a/shell/child_process_host.cc b/shell/child_process_host.cc
index b0bc6ad997593bdf4c53c925fc571ecb5f8f1261..7de4602d681e1f881404a4d0a62e463a36faf10c 100644
--- a/shell/child_process_host.cc
+++ b/shell/child_process_host.cc
@@ -42,11 +42,14 @@ ChildProcessHost::~ChildProcessHost() {
DCHECK(!child_process_.IsValid());
}
-void ChildProcessHost::Start() {
+void ChildProcessHost::Start(bool require_32_bit) {
DCHECK(!child_process_.IsValid());
scoped_ptr<LaunchData> launch_data(new LaunchData());
- launch_data->child_path = context_->mojo_shell_child_path();
+ if (require_32_bit)
+ launch_data->child_path = context_->mojo_shell_child_path_32_bit();
+ else
+ launch_data->child_path = context_->mojo_shell_child_path();
// TODO(vtl): Add something for |slave_info|.
// TODO(vtl): The "unretained this" is wrong (see also below).

Powered by Google App Engine
This is Rietveld 408576698