chrome/app/chrome_main_delegate.cc - Issue 10915268: Made chrome_main_delegate match the base class's definition.

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 10915268: Made chrome_main_delegate match the base class's definition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix error. Created 8 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/chrome_main_delegate.cc

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

index e8433d34ddfe30686efa884e495bd33098417cef..9a83f2ec1f058446a31c642f9560c8449523b695 100644

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

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

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

return process_type == switches::kNaClLoaderProcess ||

process_type == switches::kRelauncherProcess;

}

-#elif defined(OS_POSIX)

+#elif defined(OS_POSIX) && !defined(OS_ANDROID)

content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() {

#if defined(DISABLE_NACL)

return NULL;

« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | no next file » | no next file with comments »