chrome/app/chrome_main_delegate.cc - Issue 17198013: Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap

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/chrome_main_delegate.cc

Issue 17198013: Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bring nacl_paths back Created 7 years, 6 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

Index: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index 06f8c17934d0d014f905fa368caa56dde298f76e..377e1a480d09139f032616d6ac8abf1ee5489ad2 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -62,8 +62,9 @@

#include <signal.h>

#endif

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

+#if !defined(DISABLE_NACL) && defined(OS_LINUX)

#include "chrome/app/nacl_fork_delegate_linux.h"

+#include "chrome/common/nacl_paths.h"

#endif

#if defined(OS_CHROMEOS)

@@ -474,6 +475,9 @@ void ChromeMainDelegate::PreSandboxStartup() {

#if defined(OS_CHROMEOS)

chromeos::RegisterPathProvider();

#endif

+#if !defined(DISABLE_NACL) && defined(OS_LINUX)

+ nacl::RegisterPathProvider();

+#endif

#if defined(OS_MACOSX)

// On the Mac, the child executable lives at a predefined location within

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