chrome/app/client_util.cc - Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/client_util.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:

Index: chrome/app/client_util.cc

===================================================================

--- chrome/app/client_util.cc (revision 100721)

+++ chrome/app/client_util.cc (working copy)

@@ -168,21 +168,7 @@

HMODULE LoadChromeWithDirectory(std::wstring* dir) {

::SetCurrentDirectoryW(dir->c_str());

const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();

-#ifdef _WIN64

- if ((cmd_line.GetSwitchValueASCII(switches::kProcessType) ==

- switches::kNaClBrokerProcess) ||

- (cmd_line.GetSwitchValueASCII(switches::kProcessType) ==

- switches::kNaClLoaderProcess)) {

- // Load the 64-bit DLL when running in a 64-bit process.

- dir->append(installer::kChromeNaCl64Dll);

- } else {

- // Only NaCl broker and loader can be launched as Win64 processes.

- NOTREACHED();

- return NULL;

- }

-#else

dir->append(installer::kChromeDll);

-#endif

#ifndef WIN_DISABLE_PREREAD

#ifdef NDEBUG

« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/app/dummy_main_functions.cc » ('j') | no next file with comments »