diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 18:37:51 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 18:37:51 +0000 |
| commit | 23f77116cafe9a88819b60c7606453ae0db8f35d (patch) | |
| tree | aacf7537fca0c887449f46980b992bf26f107d38 /chrome/common/chrome_constants.cc | |
| parent | ef42e30fbfcd6db1c2a5ed77818db2329b5bd1a8 (diff) | |
| download | chromium_src-23f77116cafe9a88819b60c7606453ae0db8f35d.zip chromium_src-23f77116cafe9a88819b60c7606453ae0db8f35d.tar.gz chromium_src-23f77116cafe9a88819b60c7606453ae0db8f35d.tar.bz2 | |
More POSIX support for Chromium, consisting mostly of broadening ifdefs. This
patch cuts across modules, as there's only a handful necessary for each,
with the most in chrome/test/. ALSA is enabled on FreeBSD and Solaris, as
libasound has been ported to those two platforms, and I moved resolv.h in
host_resolver_proc.cc, because it depends on headers from sys_addrinfo.h on
FreeBSD.
Patch by ruben (chromium@hybridsource.org)
Review URL: http://codereview.chromium.org/6976055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_constants.cc')
| -rw-r--r-- | chrome/common/chrome_constants.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index e817be0..d6d610e 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[] = |