chrome/app/chrome_main_delegate.h - 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.h

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.h

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

index 53b382741b5f79a498b50bcb7efd49e1b198b1ae..f8f6e2a641e2292bc53d7c8967afac65872aed41 100644

--- a/chrome/app/chrome_main_delegate.h

+++ b/chrome/app/chrome_main_delegate.h

@@ -31,7 +31,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate {

virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;

virtual bool DelaySandboxInitialization(

const std::string& process_type) OVERRIDE;

-#elif defined(OS_POSIX)

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

virtual content::ZygoteForkDelegate* ZygoteStarting() OVERRIDE;

virtual void ZygoteForked() OVERRIDE;

#endif

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