chrome/app/chrome_main_delegate.cc - Issue 23320004: reland 'Set chrome_multiple_dll=1 by default on Windows in static_library'

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 23320004: reland 'Set chrome_multiple_dll=1 by default on Windows in static_library' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix define Created 7 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:

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 671f5af8155ca82ef8f39beae8c38829d32634cb..623b20ab85a362b6a3b67476084389990bc04732 100644

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

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

@@ -744,9 +744,9 @@ int ChromeMainDelegate::RunProcess(

const content::MainFunctionParams& main_function_params) {

// ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize

// doesn't support empty array. So we comment out the block for Android.

-#if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD)

+#if !defined(OS_ANDROID)

static const MainFunction kMainFunctions[] = {

-#if defined(ENABLE_FULL_PRINTING)

+#if defined(ENABLE_FULL_PRINTING) && !defined(CHROME_MULTIPLE_DLL_CHILD)

{ switches::kServiceProcess, ServiceProcessMain },

#endif

« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »