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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <windows.h> 5 #include <windows.h>
6 #include <tchar.h> 6 #include <tchar.h>
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/win_util.h" 10 #include "base/win_util.h"
(...skipping 15 matching lines...) Expand all
26 if (ShowRestartDialogIfCrashed(&exit_now)) { 26 if (ShowRestartDialogIfCrashed(&exit_now)) {
27 if (exit_now) 27 if (exit_now)
28 return ResultCodes::NORMAL_EXIT; 28 return ResultCodes::NORMAL_EXIT;
29 } 29 }
30 30
31 // Initialize the commandline singleton from the environment. 31 // Initialize the commandline singleton from the environment.
32 CommandLine::Init(0, NULL); 32 CommandLine::Init(0, NULL);
33 33
34 // Initialize the sandbox services. 34 // Initialize the sandbox services.
35 sandbox::SandboxInterfaceInfo sandbox_info = {0}; 35 sandbox::SandboxInterfaceInfo sandbox_info = {0};
36 #ifndef _WIN64 // Sandbox does not support Win64 yet - remove when it does
36 sandbox_info.broker_services = sandbox::SandboxFactory::GetBrokerServices(); 37 sandbox_info.broker_services = sandbox::SandboxFactory::GetBrokerServices();
37 if (!sandbox_info.broker_services) 38 if (!sandbox_info.broker_services)
38 sandbox_info.target_services = sandbox::SandboxFactory::GetTargetServices(); 39 sandbox_info.target_services = sandbox::SandboxFactory::GetTargetServices();
39 40
40 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 41 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
41 // Enforces strong DEP support. Vista uses the NXCOMPAT flag in the exe. 42 // Enforces strong DEP support. Vista uses the NXCOMPAT flag in the exe.
42 sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED); 43 sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED);
43 } 44 }
44 45 #endif // _WIN64
45 // Load and launch the chrome dll. *Everything* happens inside. 46 // Load and launch the chrome dll. *Everything* happens inside.
46 MainDllLoader* loader = MakeMainDllLoader(); 47 MainDllLoader* loader = MakeMainDllLoader();
47 int rc = loader->Launch(instance, &sandbox_info); 48 int rc = loader->Launch(instance, &sandbox_info);
48 delete loader; 49 delete loader;
49 50
50 return rc; 51 return rc;
51 } 52 }
OLDNEW
« 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