| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/common/sandbox_policy.h" | 5 #include "chrome/common/sandbox_policy.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/win_util.h" | 9 #include "app/win_util.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 // The user has explicity opted-out from all sandboxing. | 540 // The user has explicity opted-out from all sandboxing. |
| 541 in_sandbox = false; | 541 in_sandbox = false; |
| 542 } | 542 } |
| 543 | 543 |
| 544 #if !defined (GOOGLE_CHROME_BUILD) | 544 #if !defined (GOOGLE_CHROME_BUILD) |
| 545 if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) { | 545 if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) { |
| 546 // In process plugins won't work if the sandbox is enabled. | 546 // In process plugins won't work if the sandbox is enabled. |
| 547 in_sandbox = false; | 547 in_sandbox = false; |
| 548 } | 548 } |
| 549 #endif | 549 #endif |
| 550 if (!browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) && | 550 if (!browser_command_line.HasSwitch(switches::kDisable3DAPIs) && |
| 551 !browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) && |
| 551 browser_command_line.HasSwitch(switches::kInProcessWebGL)) { | 552 browser_command_line.HasSwitch(switches::kInProcessWebGL)) { |
| 552 // In process WebGL won't work if the sandbox is enabled. | 553 // In process WebGL won't work if the sandbox is enabled. |
| 553 in_sandbox = false; | 554 in_sandbox = false; |
| 554 } | 555 } |
| 555 | 556 |
| 556 // Propagate the Chrome Frame flag to sandboxed processes if present. | 557 // Propagate the Chrome Frame flag to sandboxed processes if present. |
| 557 if (browser_command_line.HasSwitch(switches::kChromeFrame)) { | 558 if (browser_command_line.HasSwitch(switches::kChromeFrame)) { |
| 558 if (!cmd_line->HasSwitch(switches::kChromeFrame)) { | 559 if (!cmd_line->HasSwitch(switches::kChromeFrame)) { |
| 559 cmd_line->AppendSwitch(switches::kChromeFrame); | 560 cmd_line->AppendSwitch(switches::kChromeFrame); |
| 560 } | 561 } |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 | 632 |
| 632 // Help the process a little. It can't start the debugger by itself if | 633 // Help the process a little. It can't start the debugger by itself if |
| 633 // the process is in a sandbox. | 634 // the process is in a sandbox. |
| 634 if (child_needs_help) | 635 if (child_needs_help) |
| 635 base::debug::SpawnDebuggerOnProcess(target.dwProcessId); | 636 base::debug::SpawnDebuggerOnProcess(target.dwProcessId); |
| 636 | 637 |
| 637 return process; | 638 return process; |
| 638 } | 639 } |
| 639 | 640 |
| 640 } // namespace sandbox | 641 } // namespace sandbox |
| OLD | NEW |