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

Unified Diff: content/common/sandbox_policy.cc

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify chrome_exe.gypi Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/resource_dispatcher_dummy.cc ('k') | content/common/socket_stream_dispatcher_dummy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_policy.cc
===================================================================
--- content/common/sandbox_policy.cc (revision 100721)
+++ content/common/sandbox_policy.cc (working copy)
@@ -294,6 +294,7 @@
// TODO(cpu): Lock down the sandbox more if possible.
// TODO(apatrick): Use D3D9Ex to render windowless.
bool AddPolicyForGPU(CommandLine* cmd_line, sandbox::TargetPolicy* policy) {
+#if !defined(NACL_WIN64) // We don't need this code on win nacl64.
if (base::win::GetVersion() > base::win::VERSION_XP) {
policy->SetTokenLevel(sandbox::USER_RESTRICTED_SAME_ACCESS,
sandbox::USER_LIMITED);
@@ -322,6 +323,7 @@
}
AddGenericDllEvictionPolicy(policy);
+#endif
return true;
}
@@ -459,11 +461,13 @@
PROCESS_INFORMATION target = {0};
sandbox::TargetPolicy* policy = g_broker_services->CreatePolicy();
+#if !defined(NACL_WIN64) // We don't need this code on win nacl64.
if (type == ChildProcessInfo::PLUGIN_PROCESS &&
!browser_command_line.HasSwitch(switches::kNoSandbox) &&
content::GetContentClient()->SandboxPlugin(cmd_line, policy)) {
in_sandbox = true;
}
+#endif
if (!in_sandbox) {
policy->Release();
« no previous file with comments | « content/common/resource_dispatcher_dummy.cc ('k') | content/common/socket_stream_dispatcher_dummy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698