chrome/common/chrome_paths.cc - Issue 7811013: Revert 98909 - Use chain-loading for Linux nacl_helper

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/common/chrome_paths.cc

Issue 7811013: Revert 98909 - Use chain-loading for Linux nacl_helper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 4 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/common/chrome_paths.cc

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

--- chrome/common/chrome_paths.cc (revision 98909)

+++ chrome/common/chrome_paths.cc (working copy)

@@ -53,10 +53,8 @@

#endif

#if defined(OS_POSIX) && !defined(OS_MACOSX)

-// File name of the nacl_helper and nacl_helper_bootstrap, Linux only.

+// File name of the nacl_helper, Linux only.

const FilePath::CharType kInternalNaClHelperFileName[] =

- FILE_PATH_LITERAL("nacl_helper");

-const FilePath::CharType kInternalNaClHelperBootstrapFileName[] =

FILE_PATH_LITERAL("nacl_helper_bootstrap");

#endif

@@ -248,11 +246,6 @@

return false;

cur = cur.Append(kInternalNaClHelperFileName);

break;

- case chrome::FILE_NACL_HELPER_BOOTSTRAP:

- if (!PathService::Get(base::DIR_MODULE, &cur))

- return false;

- cur = cur.Append(kInternalNaClHelperBootstrapFileName);

- break;

#endif

case chrome::FILE_RESOURCES_PACK:

#if defined(OS_MACOSX)

« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/nacl.gypi » ('j') | no next file with comments »