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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
575 env->SetVar(kPath, new_path); | 575 env->SetVar(kPath, new_path); |
576 } | 576 } |
577 #endif // _DLL | 577 #endif // _DLL |
578 } | 578 } |
579 #endif | 579 #endif |
580 | 580 |
581 scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path)); | 581 scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path)); |
582 CopyNaClCommandLineArguments(cmd_line.get()); | 582 CopyNaClCommandLineArguments(cmd_line.get()); |
583 | 583 |
584 cmd_line->AppendSwitchASCII(switches::kProcessType, | 584 cmd_line->AppendSwitchASCII(switches::kProcessType, |
585 uses_nonsfi_mode_ ? | |
Mark Seaborn
2014/03/28 01:38:25
Can you split out the parts that plumb through "us
hamaji
2014/03/28 12:06:10
Thanks for the review! I've uploaded another CL fo
| |
586 switches::kNaClNonSfiLoaderProcess : | |
585 switches::kNaClLoaderProcess); | 587 switches::kNaClLoaderProcess); |
586 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 588 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
587 if (NaClBrowser::GetDelegate()->DialogsAreSuppressed()) | 589 if (NaClBrowser::GetDelegate()->DialogsAreSuppressed()) |
588 cmd_line->AppendSwitch(switches::kNoErrorDialogs); | 590 cmd_line->AppendSwitch(switches::kNoErrorDialogs); |
589 | 591 |
590 // On Windows we might need to start the broker process to launch a new loader | 592 // On Windows we might need to start the broker process to launch a new loader |
591 #if defined(OS_WIN) | 593 #if defined(OS_WIN) |
592 if (RunningOnWOW64()) { | 594 if (RunningOnWOW64()) { |
593 if (!NaClBrokerService::GetInstance()->LaunchLoader( | 595 if (!NaClBrokerService::GetInstance()->LaunchLoader( |
594 weak_factory_.GetWeakPtr(), channel_id)) { | 596 weak_factory_.GetWeakPtr(), channel_id)) { |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1076 process_handle.Take(), info, | 1078 process_handle.Take(), info, |
1077 base::MessageLoopProxy::current(), | 1079 base::MessageLoopProxy::current(), |
1078 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1080 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
1079 weak_factory_.GetWeakPtr())); | 1081 weak_factory_.GetWeakPtr())); |
1080 return true; | 1082 return true; |
1081 } | 1083 } |
1082 } | 1084 } |
1083 #endif | 1085 #endif |
1084 | 1086 |
1085 } // namespace nacl | 1087 } // namespace nacl |
OLD | NEW |