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

Unified Diff: chrome/app/chrome_exe_main.cc

Issue 371073: Add support for 64-bit Windows build: base and chrome/app (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_exe_main.cc
===================================================================
--- chrome/app/chrome_exe_main.cc (revision 33729)
+++ chrome/app/chrome_exe_main.cc (working copy)
@@ -33,6 +33,7 @@
// Initialize the sandbox services.
sandbox::SandboxInterfaceInfo sandbox_info = {0};
+#ifndef _WIN64 // Sandbox does not support Win64 yet - remove when it does
sandbox_info.broker_services = sandbox::SandboxFactory::GetBrokerServices();
if (!sandbox_info.broker_services)
sandbox_info.target_services = sandbox::SandboxFactory::GetTargetServices();
@@ -41,7 +42,7 @@
// Enforces strong DEP support. Vista uses the NXCOMPAT flag in the exe.
sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED);
}
-
+#endif // _WIN64
// Load and launch the chrome dll. *Everything* happens inside.
MainDllLoader* loader = MakeMainDllLoader();
int rc = loader->Launch(instance, &sandbox_info);
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698