chrome/common/chrome_constants.cc - Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This

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/common/chrome_constants.cc

Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

View side-by-side diff with in-line comments

Download patch

Index: chrome/common/chrome_constants.cc

diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc

index e817be0a169fb54efd9528cca41010822c08fff3..d6d610edc10e330b8c8389a55563816ecf82ded5 100644

--- a/chrome/common/chrome_constants.cc

+++ b/chrome/common/chrome_constants.cc

@@ -27,27 +27,27 @@ const char kChromeVersionEnvVar[] = "CHROME_VERSION";

#if defined(OS_WIN)

const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome.exe");

const FilePath::CharType kHelperProcessExecutableName[] = FPL("chrome.exe");

-#elif defined(OS_LINUX)

-const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome");

-// Helper processes end up with a name of "exe" due to execing via

-// /proc/self/exe. See bug 22703.

-const FilePath::CharType kHelperProcessExecutableName[] = FPL("exe");

#elif defined(OS_MACOSX)

const FilePath::CharType kBrowserProcessExecutableName[] = FPL(PRODUCT_STRING);

const FilePath::CharType kHelperProcessExecutableName[] =

FPL(PRODUCT_STRING " Helper");

+#elif defined(OS_POSIX)

+const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome");

+// Helper processes end up with a name of "exe" due to execing via

+// /proc/self/exe. See bug 22703.

+const FilePath::CharType kHelperProcessExecutableName[] = FPL("exe");

#endif // OS_*

#if defined(OS_WIN)

const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome.exe");

const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe");

-#elif defined(OS_LINUX)

-const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome");

-const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");

#elif defined(OS_MACOSX)

const FilePath::CharType kBrowserProcessExecutablePath[] =

FPL(PRODUCT_STRING ".app/Contents/MacOS/" PRODUCT_STRING);

const FilePath::CharType kHelperProcessExecutablePath[] =

FPL(PRODUCT_STRING " Helper.app/Contents/MacOS/" PRODUCT_STRING " Helper");

+#elif defined(OS_POSIX)

+const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome");

+const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");

#endif // OS_*

#if defined(OS_MACOSX)

const FilePath::CharType kFrameworkName[] =

« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/automated_ui_tests/automated_ui_tests.cc » ('j') | no next file with comments »