chrome/app/chrome_main_delegate.cc - Issue 279693002: Split NaCl SFI and non-SFI helpers into separate processes

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 279693002: Split NaCl SFI and non-SFI helpers into separate processes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Oops, forgot to "git add" new files Created 6 years, 7 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/chrome_main_delegate.cc

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

index 486cd42220d210c531f6fcaaa862f7ffb5dffb0e..428c768eda060cb9ab645689f360eeb6828cbe9c 100644

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

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

@@ -71,8 +71,8 @@

#endif

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

+#include "components/nacl/app/nacl_fork_delegates_linux.h"

#include "components/nacl/common/nacl_paths.h"

-#include "components/nacl/zygote/nacl_fork_delegate_linux.h"

#endif

#if defined(OS_CHROMEOS)

@@ -858,7 +858,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(

void ChromeMainDelegate::ZygoteStarting(

ScopedVector<content::ZygoteForkDelegate>* delegates) {

#if !defined(DISABLE_NACL)

- delegates->push_back(new NaClForkDelegate());

+ nacl::AddNaClZygoteForkDelegates(delegates);

#endif

}