OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "components/nacl/browser/nacl_process_host.h" | 5 #include "components/nacl/browser/nacl_process_host.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 if (!NaClBrokerService::GetInstance()->LaunchLoader( | 662 if (!NaClBrokerService::GetInstance()->LaunchLoader( |
663 weak_factory_.GetWeakPtr(), mojo_channel_token)) { | 663 weak_factory_.GetWeakPtr(), mojo_channel_token)) { |
664 SendErrorToRenderer("broker service did not launch process"); | 664 SendErrorToRenderer("broker service did not launch process"); |
665 return false; | 665 return false; |
666 } | 666 } |
667 return true; | 667 return true; |
668 } | 668 } |
669 #endif | 669 #endif |
670 process_->Launch( | 670 process_->Launch( |
671 new NaClSandboxedProcessLauncherDelegate(process_->GetHost()), | 671 new NaClSandboxedProcessLauncherDelegate(process_->GetHost()), |
| 672 #if defined(OS_WIN) |
| 673 NULL, |
| 674 #endif |
672 cmd_line.release(), | 675 cmd_line.release(), |
673 true); | 676 true); |
674 return true; | 677 return true; |
675 } | 678 } |
676 | 679 |
677 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) { | 680 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) { |
678 if (uses_nonsfi_mode_) { | 681 if (uses_nonsfi_mode_) { |
679 // IPC messages relating to NaCl's validation cache must not be exposed | 682 // IPC messages relating to NaCl's validation cache must not be exposed |
680 // in Non-SFI Mode, otherwise a Non-SFI nexe could use SetKnownToValidate | 683 // in Non-SFI Mode, otherwise a Non-SFI nexe could use SetKnownToValidate |
681 // to create a hole in the SFI sandbox. | 684 // to create a hole in the SFI sandbox. |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1299 NaClStartDebugExceptionHandlerThread( | 1302 NaClStartDebugExceptionHandlerThread( |
1300 std::move(process), info, base::ThreadTaskRunnerHandle::Get(), | 1303 std::move(process), info, base::ThreadTaskRunnerHandle::Get(), |
1301 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1304 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
1302 weak_factory_.GetWeakPtr())); | 1305 weak_factory_.GetWeakPtr())); |
1303 return true; | 1306 return true; |
1304 } | 1307 } |
1305 } | 1308 } |
1306 #endif | 1309 #endif |
1307 | 1310 |
1308 } // namespace nacl | 1311 } // namespace nacl |
OLD | NEW |