| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/base_switches.h" | 5 #include "base/base_switches.h" |
| 6 #include "base/basictypes.h" | 6 #include "base/basictypes.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "components/nacl/common/nacl_switches.h" | 8 #include "components/nacl/common/nacl_switches.h" |
| 9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 | 10 |
| 11 namespace nacl { | 11 namespace nacl { |
| 12 | 12 |
| 13 void CopyNaClCommandLineArguments(CommandLine* cmd_line) { | 13 void CopyNaClCommandLineArguments(base::CommandLine* cmd_line) { |
| 14 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); | 14 const base::CommandLine& browser_command_line = |
| 15 *base::CommandLine::ForCurrentProcess(); |
| 15 | 16 |
| 16 // Propagate the following switches to the NaCl loader command line (along | 17 // Propagate the following switches to the NaCl loader command line (along |
| 17 // with any associated values) if present in the browser command line. | 18 // with any associated values) if present in the browser command line. |
| 18 // TODO(gregoryd): check which flags of those below can be supported. | 19 // TODO(gregoryd): check which flags of those below can be supported. |
| 19 static const char* const kSwitchNames[] = { | 20 static const char* const kSwitchNames[] = { |
| 20 switches::kNoSandbox, | 21 switches::kNoSandbox, |
| 21 switches::kDisableBreakpad, | 22 switches::kDisableBreakpad, |
| 22 switches::kFullMemoryCrashReport, | 23 switches::kFullMemoryCrashReport, |
| 23 switches::kEnableLogging, | 24 switches::kEnableLogging, |
| 24 switches::kDisableLogging, | 25 switches::kDisableLogging, |
| 25 switches::kLoggingLevel, | 26 switches::kLoggingLevel, |
| 26 switches::kNoErrorDialogs, | 27 switches::kNoErrorDialogs, |
| 27 #if defined(OS_MACOSX) | 28 #if defined(OS_MACOSX) |
| 28 switches::kEnableSandboxLogging, | 29 switches::kEnableSandboxLogging, |
| 29 #endif | 30 #endif |
| 30 }; | 31 }; |
| 31 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 32 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 32 arraysize(kSwitchNames)); | 33 arraysize(kSwitchNames)); |
| 33 } | 34 } |
| 34 | 35 |
| 35 } // namespace nacl | 36 } // namespace nacl |
| OLD | NEW |