Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: chrome/common/sandbox_policy.cc

Issue 6179002: Added group policy for disabling all client-side 3D APIs in Chromium ... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/sandbox_init_wrapper_mac.cc ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « chrome/common/sandbox_init_wrapper_mac.cc ('k') | chrome/renderer/render_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698