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

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

Issue 6215001: Revert 70548 - Reverse flag for kDisableExperimentalWebGL... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597s/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/chrome_switches.cc ('k') | chrome/common/sandbox_policy.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_init_wrapper.h" 5 #include "chrome/common/sandbox_init_wrapper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/sandbox_mac.h" 11 #include "chrome/common/sandbox_mac.h"
12 12
13 bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line, 13 bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
14 const std::string& process_type) { 14 const std::string& process_type) {
15 using sandbox::Sandbox; 15 using sandbox::Sandbox;
16 16
17 if (command_line.HasSwitch(switches::kNoSandbox)) 17 if (command_line.HasSwitch(switches::kNoSandbox))
18 return true; 18 return true;
19 19
20 Sandbox::SandboxProcessType sandbox_process_type; 20 Sandbox::SandboxProcessType sandbox_process_type;
21 FilePath allowed_dir; // Empty by default. 21 FilePath allowed_dir; // Empty by default.
22 22
23 if (process_type.empty()) { 23 if (process_type.empty()) {
24 // Browser process isn't sandboxed. 24 // Browser process isn't sandboxed.
25 return true; 25 return true;
26 } else if (process_type == switches::kRendererProcess) { 26 } else if (process_type == switches::kRendererProcess) {
27 if (command_line.HasSwitch(switches::kEnableExperimentalWebGL) && 27 if (!command_line.HasSwitch(switches::kDisableExperimentalWebGL) &&
28 command_line.HasSwitch(switches::kInProcessWebGL)) { 28 command_line.HasSwitch(switches::kInProcessWebGL)) {
29 // TODO(kbr): this check seems to be necessary only on this 29 // TODO(kbr): this check seems to be necessary only on this
30 // platform because the sandbox is initialized later. Remove 30 // platform because the sandbox is initialized later. Remove
31 // this once this flag is removed. 31 // this once this flag is removed.
32 return true; 32 return true;
33 } else { 33 } else {
34 sandbox_process_type = Sandbox::SANDBOX_TYPE_RENDERER; 34 sandbox_process_type = Sandbox::SANDBOX_TYPE_RENDERER;
35 } 35 }
36 } else if (process_type == switches::kExtensionProcess) { 36 } else if (process_type == switches::kExtensionProcess) {
37 // Extension processes are just renderers [they use RenderMain()] with a 37 // Extension processes are just renderers [they use RenderMain()] with a
(...skipping 26 matching lines...) Expand all
64 NOTREACHED(); 64 NOTREACHED();
65 return true; 65 return true;
66 } 66 }
67 67
68 // Warm up APIs before turning on the sandbox. 68 // Warm up APIs before turning on the sandbox.
69 Sandbox::SandboxWarmup(); 69 Sandbox::SandboxWarmup();
70 70
71 // Actually sandbox the process. 71 // Actually sandbox the process.
72 return Sandbox::EnableSandbox(sandbox_process_type, allowed_dir); 72 return Sandbox::EnableSandbox(sandbox_process_type, allowed_dir);
73 } 73 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/common/sandbox_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698