OLD | NEW |
1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-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 "app/win_util.h" | 7 #include "app/win_util.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug_util.h" | 9 #include "base/debug_util.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 type = ChildProcessInfo::GPU_PROCESS; | 414 type = ChildProcessInfo::GPU_PROCESS; |
415 } else { | 415 } else { |
416 NOTREACHED(); | 416 NOTREACHED(); |
417 return 0; | 417 return 0; |
418 } | 418 } |
419 | 419 |
420 bool in_sandbox = | 420 bool in_sandbox = |
421 (type != ChildProcessInfo::NACL_BROKER_PROCESS) && | 421 (type != ChildProcessInfo::NACL_BROKER_PROCESS) && |
422 !browser_command_line.HasSwitch(switches::kNoSandbox) && | 422 !browser_command_line.HasSwitch(switches::kNoSandbox) && |
423 (type != ChildProcessInfo::PLUGIN_PROCESS || | 423 (type != ChildProcessInfo::PLUGIN_PROCESS || |
424 browser_command_line.HasSwitch(switches::kSafePlugins)); | 424 browser_command_line.HasSwitch(switches::kSafePlugins)) && |
| 425 (type != ChildProcessInfo::GPU_PROCESS); |
425 #if !defined (GOOGLE_CHROME_BUILD) | 426 #if !defined (GOOGLE_CHROME_BUILD) |
426 if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) { | 427 if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) { |
427 // In process plugins won't work if the sandbox is enabled. | 428 // In process plugins won't work if the sandbox is enabled. |
428 in_sandbox = false; | 429 in_sandbox = false; |
429 } | 430 } |
430 #endif | 431 #endif |
431 | 432 |
432 // Propagate the Chrome Frame flag to sandboxed processes if present. | 433 // Propagate the Chrome Frame flag to sandboxed processes if present. |
433 if (browser_command_line.HasSwitch(switches::kChromeFrame)) { | 434 if (browser_command_line.HasSwitch(switches::kChromeFrame)) { |
434 if (!cmd_line->HasSwitch(switches::kChromeFrame)) { | 435 if (!cmd_line->HasSwitch(switches::kChromeFrame)) { |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
500 | 501 |
501 // Help the process a little. It can't start the debugger by itself if | 502 // Help the process a little. It can't start the debugger by itself if |
502 // the process is in a sandbox. | 503 // the process is in a sandbox. |
503 if (child_needs_help) | 504 if (child_needs_help) |
504 DebugUtil::SpawnDebuggerOnProcess(target.dwProcessId); | 505 DebugUtil::SpawnDebuggerOnProcess(target.dwProcessId); |
505 | 506 |
506 return process; | 507 return process; |
507 } | 508 } |
508 | 509 |
509 } // namespace sandbox | 510 } // namespace sandbox |
OLD | NEW |