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

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

Issue 5991003: Added group policy for disabling all client-side 3D APIs in Chromium... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 // The user has explicity opted-out from all sandboxing. 539 // The user has explicity opted-out from all sandboxing.
540 in_sandbox = false; 540 in_sandbox = false;
541 } 541 }
542 542
543 #if !defined (GOOGLE_CHROME_BUILD) 543 #if !defined (GOOGLE_CHROME_BUILD)
544 if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) { 544 if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) {
545 // In process plugins won't work if the sandbox is enabled. 545 // In process plugins won't work if the sandbox is enabled.
546 in_sandbox = false; 546 in_sandbox = false;
547 } 547 }
548 #endif 548 #endif
549 if (!browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) && 549 if (!browser_command_line.HasSwitch(switches::kDisable3DAPIs) &&
550 !browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) &&
550 browser_command_line.HasSwitch(switches::kInProcessWebGL)) { 551 browser_command_line.HasSwitch(switches::kInProcessWebGL)) {
551 // In process WebGL won't work if the sandbox is enabled. 552 // In process WebGL won't work if the sandbox is enabled.
552 in_sandbox = false; 553 in_sandbox = false;
553 } 554 }
554 555
555 // Propagate the Chrome Frame flag to sandboxed processes if present. 556 // Propagate the Chrome Frame flag to sandboxed processes if present.
556 if (browser_command_line.HasSwitch(switches::kChromeFrame)) { 557 if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
557 if (!cmd_line->HasSwitch(switches::kChromeFrame)) { 558 if (!cmd_line->HasSwitch(switches::kChromeFrame)) {
558 cmd_line->AppendSwitch(switches::kChromeFrame); 559 cmd_line->AppendSwitch(switches::kChromeFrame);
559 } 560 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 631
631 // Help the process a little. It can't start the debugger by itself if 632 // Help the process a little. It can't start the debugger by itself if
632 // the process is in a sandbox. 633 // the process is in a sandbox.
633 if (child_needs_help) 634 if (child_needs_help)
634 base::debug::SpawnDebuggerOnProcess(target.dwProcessId); 635 base::debug::SpawnDebuggerOnProcess(target.dwProcessId);
635 636
636 return process; 637 return process;
637 } 638 }
638 639
639 } // namespace sandbox 640 } // 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